Commit Graph

184 Commits

Author SHA1 Message Date
Lin
efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
keronshb
efd12e4fd5 Changes for merge 2021-11-01 12:07:44 -04:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
silicons
319c5e23fe Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not
Revert "TGUI alerts, lists, inputs"
2021-10-29 20:27:46 -07:00
Lin
5054ea87ce Merge pull request #15310 from keronshb/jaqincinerator
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
2021-10-28 21:29:50 -07:00
keronshb
b2a890269a Fixes destroy 2021-10-28 15:44:08 -04:00
keronshb
29a39ed9ea Indestructable change 2021-10-28 15:30:00 -04:00
keronshb
468b4a11ff More buffs 2021-10-28 11:26:18 -04:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
keronshb
1b38913867 Some linter fixes 2021-10-16 15:28:41 -04:00
keronshb
df0e95885e Minor fixes 2021-10-16 01:43:42 -04:00
keronshb
3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
LetterN
6739e349a0 heretics LOVES this - Also ian's birthday! 2021-09-08 09:50:07 +08:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
silicons
5601badbff deterministic explosion system (#13392)
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
2021-05-12 05:44:53 -05:00
silicons
1585afa1ef Update jacqueen.dm 2021-02-20 20:55:31 -07:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
The0bserver
ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
MrJWhit
994df11bc0 Update holidays.dm 2020-12-20 19:42:26 -05:00
Linzolle
3e951d334c fix entertainment monitors 2020-12-08 17:21:14 -06:00
MrJWhit
19420a6274 moar crimmas 2020-12-01 04:08:39 -05:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons
0001a2edca Merge pull request #13669 from Arturlang/sacrifice_tweaks
Makes cult sacrifice not permakill people anymore.
2020-11-11 11:16:15 -07:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
Dip
3afd604913 remove projectiles 2020-11-04 17:28:23 -03:00
Dip
0951e9457f right, forgot that object. 2020-11-02 16:50:45 -03:00
Dip
76e739142b Yeah let's fucking not have jacqueen or the christmas tree spawn runtimes 2020-11-02 16:46:34 -03:00
silicons
f4cfc6c1e0 Update holidays.dm 2020-10-10 16:47:03 -07:00
Fermi
f75b7a4f69 Errant comment 2020-10-06 00:22:38 +01:00
Fermi
6cc34d7779 Sneaky spans 2020-10-06 00:06:09 +01:00
Fermi
ab27d5dd30 few new barth items and span fixes 2020-10-05 23:42:00 +01:00
Fermi
bf5f755440 Oops missed something 2020-10-05 23:29:37 +01:00
Fermi
8301d3100c updates lore, runes and tgui 2020-10-05 23:03:14 +01:00
Fermi
d4bc7bf562 unnessicary returns 2020-10-05 00:44:47 +01:00
Fermi
0d0b9601be Jacq can walk again! 2020-10-05 00:43:20 +01:00
Fermi
e2ff214d6b Justin hates catgirls 2020-10-04 22:31:10 +01:00
Fermi
8be0abaf33 Few more fixes 2020-10-04 01:52:10 +01:00
Fermi
0e21d9b4bc Songs are important 2020-10-04 01:24:55 +01:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Letter N
2dd3d71b19 config&copypaste chang. 2020-08-20 16:36:24 +08:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
Putnam
f54d272b11 Yet more dynamic tweaks. 2020-08-15 23:38:21 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
kevinz000
1336404eb6 last ones 2020-06-17 21:37:19 -07:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/

* Recipes fix
2020-06-16 16:22:56 -07:00
deathride58
d4621bb704 corrects the date for lesbian visibility! 2020-06-09 20:55:22 -04:00