shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,880 Commits 5 Branches 0 Tags
348341ed80d99508ec400a779a7e669d08dd0dee
Commit Graph

24908 Commits

Author SHA1 Message Date
Timothy Teakettle
348341ed80 Merge branch 'emp-rework' of https://github.com/timothyteakettle/Citadel-Station-13 into emp-rework 2020-09-10 19:17:19 +01:00
Timothy Teakettle
b65fecca10 yay 2020-09-10 19:16:10 +01:00
timothyteakettle
d2f4d675a4 fuck 2020-09-10 03:55:24 +01:00
timothyteakettle
6da8690bc6 woops 2020-09-10 03:50:41 +01:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01: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
63b1bfd45c Merge pull request #13303 from Citadel-Station-13/silicons-patch-27 
combat defibs now hit for disarm + 35 stamina (old stunbaton values) instead of disarm + 75 stamina
 2020-09-06 18:03:59 +12:00
BlackMajor
f12a9ccefb Merge pull request #13301 from Citadel-Station-13/silicons-patch-26 
on someone's request i am making meteors slice through station ruins like butter so they are no longer free meteor shields because i want to make meteor timer 10 minutes instead of 4
 2020-09-06 18:03:05 +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
3eafab209d Merge pull request #13136 from Citadel-Station-13/silicons-patch-8 
the station charter rename now disallows any name with characters above a single byte in length unless an admin edits it to allow unicode
 2020-09-06 17:50:32 +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
silicons
6e6ca622e6 Merge pull request #13279 from Hatterhat/the-desword-block-buff 
alternate to 13728 - 60% rngblock, activeblock covers sides, effectiveness against projectiles upped
 2020-09-05 13:10:50 -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
f9bb245acc DONT MAKE THE SAME MISTAKE 2020-09-05 16:32:41 +01:00
Timothy Teakettle
c690e59085 change accent names 2020-09-05 16:26:55 +01:00
Timothy Teakettle
93501e2d3d sorry ipcs 2020-09-05 16:24:58 +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
6527e2e9ea Merge pull request #13348 from raspy-on-osu/thermomachine-why 
Thermomachine boards (Freezer/Heater) now tell you how to change their pipe layer
 2020-09-05 02:16:18 -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
raspy-on-osu
4c8983f006 init 2020-09-04 22:13:56 -04: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
14ebeddea2 Merge pull request #13304 from GrayRachnid/revert-8235-defib-notouch 
Revert "Buffs defib users by making them stop pulling automatically"
 2020-09-04 12:56:13 -07:00
silicons
80633fbc3c Merge pull request #13336 from Putnam3145/fix-threat-removal 
Fixes threat adjustment in the game panel not to always go up.
 2020-09-04 12:55:32 -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
silicons
12c5680d58 Merge pull request #13324 from Putnam3145/extools-logging 
Added threaded extools logging as an alternative to rust_g logging.
 2020-09-04 04:10:02 -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
Putnam
7dea04dca4 Wow, turns out negative*negative = positive, WHO KNEW. 2020-09-03 04:38:41 -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
Putnam3145
bce53f71ce Merge pull request #13322 from timothyteakettle/fix-accents 
makes handle_speech in ipc accent actually return the speech args so ipcs can talk
 2020-09-02 17:56:40 -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
a455092c1f aaaa 2020-09-02 19:27:04 +02:00
Ghommie
dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02:00
Putnam
7b8f7aafa8 okay no it's probably this. 2020-09-02 00:57:28 -07:00
GrayRachnid
a7a8bb7992 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into revert-8235-defib-notouch 2020-09-01 23:57:06 -04:00