shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,879 Commits 5 Branches 0 Tags
0746116e1791bf0b87bf103069a254b6fbd4858f
Commit Graph

16519 Commits

Author SHA1 Message Date
DeltaFire
0746116e17 fixes a bunch of blacksmithing stuff 
the blacksmithing skill is now actually dwarfy instead of not because of a typo

picking up how ingots without gloves is now not a better decision than picking them up with non-heatresistant gloves.

you can't interact with anvils while they are already being worked to prevent issues.

Also fixes associative skill level code a tiny bit.
 2020-09-25 22:04:55 +02:00
DeltaFire
9f191c67f3 some stuff 2020-09-07 21:47:35 +02:00
silicons
45ee1cbbf8 Merge pull request #13334 from CameronWoof/revert-12739-DRAKEBORG 
Revert Drakeborgs
 2020-09-06 15:22:16 -07:00
DeltaFire15
cf61133476 typofix (#13358) 2020-09-06 20:43:19 +02:00
silicons
9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces 
Miner Loot Shuffle MK III
 2020-09-06 01:58:46 -07:00
Letter N
fd2ec66757 Ports "Fix bicon(icon2html) showing full dmis, fix asset cache hashes being incorrect." (#13347) 2020-09-06 09:23:28 +02:00
BlackMajor
8b59b4a80d Merge pull request #13332 from Citadel-Station-13/silicons-patch-31 
makes magweapons emp-immune
 2020-09-06 18:05:34 +12:00
BlackMajor
75e38edb43 Merge pull request #13287 from Citadel-Station-13/revert-13122-haha 
Reverts load delays because it's still a problem and by god am I just done at this point
 2020-09-06 18:01:09 +12:00
BlackMajor
1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing 
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
 2020-09-06 17:53:35 +12:00
BlackMajor
fb531e88d8 Merge pull request #13073 from Citadel-Station-13/silicons-patch-84 
you can no longer attack people with surgical tools if you are in help intent
 2020-09-06 17:49:35 +12:00
silicons
4b9b68f398 Merge pull request #13311 from Putnam3145/fix-pool-reagents 
Makes pool actually check for reagents
 2020-09-05 13:11:39 -07:00
Putnam3145
d6127d71a8 Merge pull request #13352 from timothyteakettle/fix-accents-but-pushed-this-time 
lets ipcs talk but i actually push my changes this time
 2020-09-05 08:40:31 -07:00
Timothy Teakettle
c690e59085 change accent names 2020-09-05 16:26:55 +01:00
silicons
7b50b22c7b Merge pull request #13244 from lolman360/AnPrimAssistants 
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
 2020-09-05 02:20:11 -07:00
silicons
e110945568 Merge pull request #13289 from kiwedespars/heretics-touchup 
heretics touchup
 2020-09-05 02:15:21 -07:00
silicons
a58a67f90c Merge pull request #13339 from Putnam3145/dynamic-event-decouples 
Completely decouples events from dynamic.
 2020-09-05 02:12:00 -07:00
silicons
0efc5bdaed Merge pull request #13341 from Putnam3145/brain-trauma-nerf 
Nerfs random brain trauma a good deal.
 2020-09-05 02:11:40 -07:00
Putnam3145
62fae3515a Merge pull request #13326 from Citadel-Station-13/silicons-patch-29 
radioactive ghosts redux
 2020-09-04 18:07:34 -07:00
silicons
dba1f6af23 Merge pull request #13321 from Putnam3145/fix-ghost-dorm 
Makes ghost dojo hilbert hotel's numbers less trivially deducible.
 2020-09-04 12:56:50 -07:00
silicons
23a09aa3a3 Merge pull request #13335 from deathride58/propertempnotif 
Adds shivering/sweating notifications (in devman terms: readds the old temperature notifications)
 2020-09-04 12:55:16 -07:00
silicons
46439eac04 Merge pull request #13333 from raspy-on-osu/smshard-examine-dialog 
adds anchored state/anchoring tip to supermatter shard examine text
 2020-09-04 12:54:59 -07:00
silicons
bd53b17e52 Merge pull request #13331 from raspy-on-osu/atmos-holofanstotools 
moves engineering projectors to the "tool designs" protolathe category
 2020-09-04 12:54:44 -07:00
Putnam
bb9374a3f0 Significantly reduced chance of severe trauma, too. 2020-09-03 18:15:58 -07:00
Putnam
c48dd86e6e Makes brain trauma not roll lobotomy-resist and only happen when there's doctors. 2020-09-03 18:03:11 -07:00
Putnam
4ef4220c88 Completely decouples events from dynamic. 2020-09-03 16:38:16 -07:00
Putnam
6fe345dc2c Makes the character save test more verbose when failing. 2020-09-03 15:44:43 -07:00
deathride58
1c9a22fa5e Readds the old temperature notification method in the form of a shivering/sweating notification 2020-09-03 01:35:28 -04:00
Cameron!
e3af0d654e Revert "[READY] DRAKEBORGS & PLUSHIES" 2020-09-02 17:47:22 -07:00
raspy-on-osu
b186f8ac05 init 2020-09-02 20:26:43 -04:00
silicons
cbcacaa0af Update magweapon.dm 2020-09-02 15:51:28 -07:00
raspy-on-osu
9b56991f77 init 2020-09-02 17:54:35 -04:00
Ghommie
dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02:00
lolman360
5697ab2ff4 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 16:57:02 +10:00
silicons
aee7974140 Update astral.dm 2020-08-31 22:34:19 -07:00
silicons
10fdc4427a Merge pull request #13305 from Tupinambis/maintloot2 
Removes growth pills and genital autosurgeons from the maint loot table. Shoves them in the kinkmates.
 2020-08-31 21:21:46 -07:00
silicons
9a4f9aef6e Merge pull request #13307 from raspy-on-osu/pyroanomaly-slimespawn-spam 
pyro anomaly spam salt pr (offer_control now supports ignore_category)
 2020-08-31 21:21:09 -07:00
silicons
0dc96492a1 Merge pull request #13308 from Putnam3145/save_character_unit_test 
Adds a character saving unit test
 2020-08-31 21:20:48 -07:00
silicons
77cf561f7f Merge pull request #13316 from timothyteakettle/ckey-pref 
pref for hiding your ckey from roundend report
 2020-08-31 21:19:37 -07:00
lolman360
1b52ceb63a Various changes. 2020-09-01 11:43:01 +10:00
lolman360
05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
lolman360
4d6fb10dff Nyoops. 2020-09-01 10:55:55 +10:00
lolman360
400391e8d8 Bronze anvil tweaks, clarity. 2020-09-01 10:37:56 +10:00
Putnam
c8f947011f Makes ghost dojo hilbert hotel not easily enterable. 2020-08-31 05:43:56 -07:00
Blue Wildrose
cc9648c08d Update slime.dm 2020-08-30 23:19:18 -07:00
timothyteakettle
af2c7b295e ah yes 2020-08-31 02:25:54 +01:00
timothyteakettle
a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
silicons
4bfa6d0a06 Merge pull request #13294 from Putnam3145/health-event-fix 
Added health exemption to a couple events that need it.
 2020-08-30 13:15:10 -07:00
Putnam
cba2a1645b Makes pool actually check for the reagent instead of checking for a number. 2020-08-30 06:16:21 -07:00
Trilbyspaceclone
da641c9b96 Update necropolis_chests.dm 2020-08-30 02:10:59 -04:00
Putnam
66899faa72 needs that var/ 2020-08-29 23:10:13 -07:00