158 Commits

Author SHA1 Message Date
evilew
118591046d Revert "tweaked voting code"
This reverts commit 0d91a9de6d.
2024-12-06 13:06:59 +01:00
evilew
96e0a2148e e
- GATO card resprite
- fixed airlock directions on Kilo
- removed bugged centcomm escape pod IDs
2024-12-03 00:31:12 +01:00
evilew
4518a0b016 NT to GT - comments
- added GS13 comments to wherever NT was changed into GT
2024-11-21 21:45:25 +01:00
evilew
42c59d3506 NT to GT
Changed most instances of NT (Nanotranse) to GT (GATO). Left alone stuff that makes sense for it to be NT branded
2024-11-09 23:11:05 +01:00
SandPoot
dc08550162 push 2024-08-25 04:38:03 -03:00
SandPoot
a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot
fcd036dab5 final stuff, i think? 2024-03-07 20:31:53 -03:00
SandPoot
c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot
40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
Timothy Teakettle
289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
Dan-Neposh
44e6b6ccc7 I removed the Dread_Ipad, Clockwork Slab reigns supreme 2020-08-01 16:18:25 -04:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
BlackMajor
afdf8c698a fuck 2020-07-04 19:30:20 +12:00
BlackMajor
7c21f7bd4e [s] Don't give these to your kids for christmas
Someone did a fucky wucky.
2020-07-04 17:17:34 +12:00
Ghommie
cd1c5511a4 Fixing two handed items and etcetera. 2020-06-30 16:24:04 +02:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
kevinz000
bad809ffce fixes 2020-06-04 19:56:06 -07:00
Ghom
07e42c079c Fixing cards states and user-less projectiles checking mean armor values. (#12400) 2020-06-02 15:24:13 -07:00
Ghommie
1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
TheFakeElon
9d169fc43e Adds unum (#12369)
* unoo

* bracket

* COMMA

* Update toys.dm

* fixes icons

* Update code/game/objects/items/toys.dm

Thanks ghommie

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* pool noodle and viro

* removes dupes

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-28 15:47:44 +02:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie
364ca3fdf2 There is more! 2020-05-09 01:14:29 +02:00
Ghommie
001109cfcd About ready. 2020-05-05 20:58:44 +02:00
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Ghommie
7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
d32bff7815 return list 2020-03-16 03:35:10 -07:00
kevinz000
703fca5f90 add owner argument 2020-03-16 03:24:19 -07:00
kevinz000
4d0677daa9 s 2020-03-14 21:48:23 -07:00
Ghommie
2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghom
a2fe9f0d23 Update toys.dm 2020-03-04 17:03:26 +01:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00