This website requires JavaScript.
3a10f57b3a
Update dependencies.sh
2020-03-30 05:26:16 +02:00
b6202ad5a5
Gives shutters glass so the close proc doesn't change opacity
2020-03-30 02:36:27 +01:00
f4d304bfcf
I FORGOT TO RE-ADD HOOCHMASTER AGAIN
2020-03-30 01:29:44 +01:00
3f800c179c
map merged should be no conflicts?
2020-03-30 01:08:45 +01:00
d27c802859
wait so I literally copied from master and did stuff again and it has merge conflicts, do not merge until another commit goes through
2020-03-30 00:44:59 +01:00
b52f8148cb
Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework
2020-03-30 00:32:31 +01:00
b3750207e9
Merge Conflicts
2020-03-30 00:11:34 +01:00
0bb93c3fa6
Ports "I got high and made a thing that was broke and 3 years, 2 months, 17 days later I get high and fix it."
2020-03-29 19:20:30 +02:00
98eff75e9f
Objects.
2020-03-29 18:57:48 +02:00
c9aea0b725
Bumps up dreamchecker version (possible incoming warnings from the linter)
2020-03-29 18:10:54 +02:00
d1d090ae6f
adds a length check for if the assigned targets list spontaneously deletes itself
2020-03-29 11:54:49 -04:00
c6889ad8ee
Automatic changelog generation for PR #11675 [ci skip]
2020-03-29 10:45:04 -05:00
a4313ee101
Nerfs scattershot, removes it from nukie uplink, buffs bioterror dart slugs, includes them into nukie uplink (#11675 )
2020-03-30 02:45:01 +11:00
41557d4dbf
Automatic changelog generation for PR #11673 [ci skip]
2020-03-29 10:22:06 -05:00
aa01c30656
Removes some weapons and crates that shouldn't have been added, like, ever (#11673 )
2020-03-30 02:22:03 +11:00
8a2baea426
Automatic changelog generation for PR #11674 [ci skip]
2020-03-29 10:20:41 -05:00
cd9a782d9f
Double-barreled shotgun and their children now can be used with off-hand weapons (#11674 )
2020-03-30 02:20:39 +11:00
701187451d
Automatic changelog generation for PR #11671 [ci skip]
2020-03-29 10:19:29 -05:00
02a8104c3b
Makes taserslugs actually tasers, makes mech scattershot not a oneshot (#11671 )
2020-03-30 02:19:27 +11:00
71daf03699
Automatic changelog generation for PR #11672 [ci skip]
2020-03-29 10:17:00 -05:00
3ddfbe0e29
Null Crate removal (#11672 )
2020-03-30 02:16:58 +11:00
e3e6f38285
Automatic changelog generation for PR #11679 [ci skip]
2020-03-29 10:09:28 -05:00
49416886a1
Update turf.dm (#11679 )
2020-03-29 08:09:26 -07:00
5e5bc2a690
force push.
2020-03-29 17:01:05 +02:00
c6163e2349
this time it will work, right?
2020-03-29 15:02:36 +01:00
32b8af693d
Makes AI-hacked-law sabotage only run if there's AI
2020-03-29 06:52:44 -07:00
569d7aac6f
Removes integrity sabotage
2020-03-29 06:52:21 -07:00
304b2c68bf
Finished, after a way too long break!
2020-03-29 09:36:40 -04:00
2caeaba8dc
moves two tables
2020-03-29 14:17:00 +01:00
a68ce82060
woops
2020-03-29 14:13:16 +01:00
4eb2fb531a
Update sword_point.dm (#11678 )
2020-03-29 06:03:08 -07:00
0bc6a3d4b6
Updating Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into medicalTGUINext
2020-03-29 08:35:15 -04:00
ff9f77eb8c
uuh whatever
2020-03-28 23:57:15 -07:00
abde27c098
layer changes
2020-03-28 23:43:39 -07:00
f419653c28
functionality
2020-03-19 02:04:22 -07:00
c9484e7db2
Revert "Delete split_personality.dm"
2020-03-28 20:10:24 -07:00
f9ba031525
Delete split_personality.dm
2020-03-28 20:00:16 -07:00
2c39b14f5c
Automatic changelog generation for PR #11656 [ci skip]
2020-03-28 21:06:12 -05:00
659873979f
Merge pull request #11656 from Xantholne/bumbleswakeup
2020-03-29 02:06:09 +00:00
c314703d38
Automatic changelog generation for PR #11606 [ci skip]
2020-03-28 20:53:34 -05:00
942034df51
Makes a few space ruins hard spawn (#11606 )
2020-03-28 21:53:31 -04:00
b89a6b0398
makes everything work
2020-03-29 02:44:44 +01:00
5afe5aab3f
fixes the map, adds subtype of martial art
2020-03-29 00:46:18 +00:00
f82d0755f6
Merge pull request #3 from Citadel-Station-13/master
2020-03-29 08:13:13 +08:00
46e5a18bd3
Update door_assembly.dm
2020-03-29 01:03:08 +01:00
1ab929c7c9
fixing no grav limbless slowdown
2020-03-29 00:58:33 +01:00
983d7826b6
Ports "Fixes vault and high security door material exploit and tweaks high security door cost"
2020-03-29 00:51:16 +01:00
818d7b2ebf
initial wrestling arena
2020-03-28 23:13:24 +00:00
2c3ca418ef
Automatic changelog generation for PR #11653 [ci skip]
2020-03-28 18:02:10 -05:00
9595df3e18
Merge pull request #11653 from zeroisthebiggay/holoparsiteportsarefunny
2020-03-28 16:02:08 -07:00
6cafca3f9f
Merge pull request #11652 from Ghommie/Ghommie-cit650
2020-03-28 16:00:48 -07:00
8d7276b150
Automatic changelog generation for PR #11651 [ci skip]
2020-03-28 18:00:11 -05:00
0aebf68df0
Merge pull request #11651 from zeroisthebiggay/donotreviveme
2020-03-28 16:00:08 -07:00
9797089f0c
Merge pull request #11650 from Ghommie/Ghommie-cit649
2020-03-28 15:59:40 -07:00
13abb29d7f
Automatic changelog generation for PR #11649 [ci skip]
2020-03-28 17:59:13 -05:00
015371800c
Merge pull request #11649 from Ghommie/Ghommie-cit648
2020-03-28 15:59:10 -07:00
7247904c1b
Automatic changelog generation for PR #11645 [ci skip]
2020-03-28 17:58:58 -05:00
dd90d21f93
Merge pull request #11645 from Trilbyspaceclone/vaild
2020-03-28 15:58:56 -07:00
cf24117c77
Merge pull request #11639 from Citadel-Station-13/Ghommie-patch-1
2020-03-28 15:58:29 -07:00
30a0544d0e
Automatic changelog generation for PR #11636 [ci skip]
2020-03-28 17:58:17 -05:00
938ad42735
Merge pull request #11636 from Trilbyspaceclone/patch-325
2020-03-28 15:58:14 -07:00
b51dd7dc70
make the new holodeck an option
2020-03-28 22:24:47 +00:00
954dd2f45d
Automatic changelog generation for PR #11642 [ci skip]
2020-03-28 08:46:40 -05:00
8a620b0ebc
More dynamic rework: help I wasn't done (#11642 )
2020-03-28 06:46:37 -07:00
44f1b770df
Merge pull request #11648 from Ghommie/Ghommie-cit647
2020-03-28 01:35:06 -07:00
c39dd52b5f
Merge remote-tracking branch 'citadel/master' into eldritch_affairs
2020-03-27 21:32:40 -07:00
0d35033736
Update twohanded.dm
2020-03-27 21:28:45 -07:00
354ca22c9a
Makes contractor targets actually show up in the traitor panel
2020-03-28 00:28:44 -04:00
eb84d426e1
Merge pull request #11634 from Ghommie/Ghommie-cit645
2020-03-27 21:25:31 -07:00
6c770df8ec
Automatic changelog generation for PR #11629 [ci skip]
2020-03-27 23:23:57 -05:00
39e2ae7d1f
Merge pull request #11629 from Seris02/nomoreblowingborgs
2020-03-27 21:23:54 -07:00
ee28bbf4ee
Merge pull request #11657 from Citadel-Station-13/Ghommie-patch-4
2020-03-27 21:22:06 -07:00
31c5996a5d
sound effects + block pixelshift visuals
2020-03-27 21:10:02 -07:00
ac93fecf2c
Add files via upload
2020-03-27 19:46:04 -07:00
a85d590b1d
Update bumbles.dm
2020-03-28 03:35:12 +01:00
09608dee5f
Update split_personality.dm
2020-03-28 03:30:36 +01:00
013e591218
Bumbles wake up sleepy head
2020-03-27 20:22:22 -06:00
a5b158301b
Update kinetic_crusher.dm
2020-03-28 03:11:56 +01:00
9f6c97c63f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into donotreviveme
2020-03-27 22:10:42 -04:00
6e6d8b5098
didnt port this properly
2020-03-27 22:07:48 -04:00
dba359cbaa
commit not alive immediately
2020-03-27 20:51:04 -04:00
b5c4124d7a
Merge pull request #11638 from Ghommie/Ghommie-cit646
2020-03-27 17:12:49 -07:00
15895db20d
Automatic changelog generation for PR #11614 [ci skip]
2020-03-27 18:32:32 -05:00
06bc8073cb
Merge pull request #11614 from Citadel-Station-13/Ghommie-patch-2
2020-03-27 16:32:29 -07:00
54bce5ecc6
i am hol horse
2020-03-27 18:23:18 -04:00
41e2c60d4a
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
2020-03-27 22:52:43 +01:00
7b34ebc9b5
commit not alive immediately
2020-03-27 17:13:45 -04:00
9ab0cccdec
porting stuff
2020-03-27 19:52:33 +01:00
f7ce5e5de3
infiltrator sneaky shoes fix.
2020-03-27 14:42:23 +01:00
bff77480d1
Automatic changelog generation for PR #11641 [ci skip]
2020-03-27 08:03:08 -05:00
1a6107a518
Removed nymphomania, plus code cleanup (#11641 )
2020-03-27 06:03:05 -07:00
5933563485
one line fix to a box mapping issue
2020-03-27 13:43:28 +01:00
75c4e8b19a
What the fuck travis
2020-03-27 10:17:42 +02:00
64254ed384
Merge pull request #11647 from BlackMajor/SpaceRuins
2020-03-27 00:35:40 -07:00
aa07bf262a
lmao one line fix
2020-03-27 20:32:53 +13:00
879b626cd1
Et tu
2020-03-27 03:12:04 -04:00
268bcdcbfc
Merge pull request #11643 from Putnam3145/wrap-replacement
2020-03-26 19:58:00 -07:00
de73798e0d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wrap-replacement
2020-03-26 19:51:58 -07:00
3a494e3a85
Fixes an exploit involving WRAP.
2020-03-26 19:50:13 -07:00
dab993a6a7
Automatic changelog generation for PR #11632 [ci skip]
2020-03-26 20:56:28 -05:00
Ghom