18b7069f1f
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-11 09:49:38 +08:00
4de727ce6e
Update SDQL_2.dm ( #15462 )
2022-01-09 16:59:29 +01:00
2940d141cf
please-dont-smite-us-lummox
2022-01-01 07:10:35 +01:00
8510dcc08a
Ports tgui stripping (finally) ( #15401 )
...
* Upload files
* Update items.dm
* Update files
* Update files
* Update strippable.dm
* Update strippable
* Update strippable.dm
* Upload files
* Update files
* Update files
* Update files
* update files
* Update files
* Update dog.dm
* Update strippable.dm
* Update equipping
* Update strippable.d
* Upload files
* Upload files
* Update monkey.dm
2021-12-30 07:40:15 +01:00
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
657b25b501
i forgot i didn't add ammonia yet
2021-12-08 18:05:19 -08:00
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
a47a20235f
make possess respect the new audio scheme
2021-11-22 14:20:26 +08:00
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
186b552103
merge
2021-10-29 21:50:58 -07:00
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
c80d65df73
Merge branch 'master' into familyport
2021-10-28 14:34:20 -04:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
67c6cc3fc0
tiny fix
2021-10-27 13:48:34 -03:00
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
17986fea3f
cannot escape
2021-10-16 14:24:22 -03:00
1561138350
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-16 14:11:00 -03:00
1f7e65ad01
Merge pull request #15271 from Citadel-Station-13/admin_tickets
...
fixes "answered by <admin>" spam in irc
2021-10-15 23:34:15 -07:00
6b23d177c8
Merge remote-tracking branch 'upstream/master'
2021-10-15 19:25:41 -04:00
d0eade8fe1
fix
2021-10-14 19:20:32 -07:00
e2ab532de2
Removes old gangs, families is almost ready
2021-10-12 16:34:27 -04:00
5680b74294
safety
2021-10-11 20:32:00 +02:00
66e81e7fda
asay ping time
2021-10-11 19:52:30 +02:00
437b3105d1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-08 21:05:41 -03:00
3cfaad31c1
Merge pull request #15149 from keronshb/dynamicport
...
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
0a75925df9
wack
2021-09-29 06:02:17 -07:00
c8814e8cc8
Merge remote-tracking branch 'upstream/master' into dynamicport
2021-09-19 18:09:18 -04:00
c6ce359cda
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# tgstation.dme
2021-09-19 15:23:52 -04:00
6cc4e35b44
Mob lists
2021-09-19 13:28:41 -04:00
792dc073b3
Final fixes?
2021-09-16 13:28:34 -04:00
7ed5f622f4
Dynamic
2021-09-14 19:33:17 -04:00
1ba8f25410
byond no likey :(
2021-09-08 10:35:41 +08:00
e94725344b
extool based reftracking
2021-09-08 10:30:35 +08:00
12ae614833
fix1
2021-09-08 10:22:55 +08:00
6739e349a0
heretics LOVES this - Also ian's birthday!
2021-09-08 09:50:07 +08:00
06181f51ae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# code/modules/ninja/suit/suit.dm
2021-08-19 21:55:22 -04:00
fb32aa1248
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# tgstation.dme
2021-06-20 03:29:50 -04:00
dbdc3001ba
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-16 23:33:14 -07:00
2c61a48860
Update mark_datum.dm
2021-06-12 05:09:13 -07:00
833d34ba8e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-11 16:28:12 -07:00
3b25f3e199
Started expanding auxgm a bit
2021-06-10 04:40:23 -07:00
1a90c96e4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# icons/mob/clothing/feet.dmi
# icons/mob/clothing/feet_digi.dmi
# icons/mob/clothing/head.dmi
# icons/mob/clothing/mask.dmi
# icons/mob/clothing/mask_muzzled.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/masks.dmi
# icons/obj/items_and_weapons.dmi
2021-06-09 17:40:28 -04:00
eb4b4088f4
Merge pull request #14760 from keronshb/floorcluwneport
...
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00
LetterN