2840a3f933
Merge pull request #7416 from Citadel-Station-13/kevinz000-patch-5
...
halves hypospray times
2018-08-04 00:09:05 -04:00
d9c751114b
Merge pull request #7417 from Citadel-Station-13/kevinz000-patch-6
...
doubles hypovial storage
2018-08-04 00:08:56 -04:00
bbb5c1f6d5
Merge pull request #7432 from Citadel-Station-13/quickfix002
...
Icon Fix
2018-08-04 00:08:00 -04:00
42083d7206
Removes combat rework training wheels, and nerfs myself by increasing the minimum stamloss required to throw a knockout punch with boxing gloves ( #7405 )
2018-08-03 19:29:44 -07:00
4208d6ea5f
Adds boombox donor item for Raiq/chefferz ( #7368 )
2018-08-03 19:29:19 -07:00
a56220634a
i have no idea
2018-08-03 19:47:21 -05:00
166e6b66de
Update toys.dm
2018-08-01 08:41:10 -05:00
77b3c46dbf
moves some stuff around
2018-08-01 08:07:56 -05:00
ce4da89cf1
Update custom_items.dm
2018-08-01 07:32:16 -05:00
7293bf85b5
Update custom_items.dm
2018-08-01 07:22:41 -05:00
e475970385
donate
2018-07-30 09:23:12 -05:00
6337fb77ec
ports 3 new borg sprites from rp's codebase to main's. ( #7409 )
...
engineering gets a new mr. handy sprite
medical gets a new eyebot sprite
security gets a new spider-tank sprite
2018-07-29 23:29:25 -07:00
349eb64e53
Update hypovial.dm
2018-07-28 03:11:01 -07:00
b35ea6b472
Update hypospraymkii.dm
2018-07-28 03:09:58 -07:00
fc21ee9f36
REMOVE
2018-07-25 22:12:34 -05:00
42cb534ad0
sprite/desc change
2018-07-25 06:38:54 -05:00
dbe376d751
bad names/var
2018-07-23 07:52:13 -05:00
82027db961
thing
2018-07-22 00:07:22 -05:00
6cef81d979
It's a feature now - makes it plausible to use custom say verbs in place of emotes (allows proper non-buggy emotes over radio) ( #7378 )
...
* it's a feature now - makes it plausible to use custom say verbs in place of emotes
* Makes the thing actually drop the , ""
2018-07-20 03:41:12 -07:00
77c2970b49
buffs the syndicate mask, makes it cost 2 tc ( #7147 )
2018-07-20 03:39:54 -07:00
815767d475
Merge pull request #7381 from ursamedium/minor
...
Minor grammar fix + crow pAI rest fix
2018-07-18 18:08:08 -04:00
d4fac96c70
Merge pull request #7374 from Citadel-Station-13/kevinz000-patch-1
...
hardcaps stamina to 200 again
2018-07-18 18:07:37 -04:00
586d3a3456
super minor fix
2018-07-18 01:22:56 -04:00
f74eff85ba
Merge pull request #7365 from Trilbyspaceclone/patch-6
...
Makes Revs have a min pop needed
2018-07-17 11:19:27 -04:00
e3d7ce9793
Update damage_procs.dm
2018-07-16 01:50:33 -07:00
f081239613
Update damage_procs.dm
2018-07-15 23:00:48 -07:00
10b9e8ab99
Merge pull request #7023 from Citadel-Station-13/lmao
...
Telebatons/policebatons buffed to be a viable stun weapon (but not as good as stunbatons/prods), secways nerfed to non-sprint movespeed with sprint buffer (but this time they're actually responsive instead of being laggy and the buffer is weaker)
2018-07-15 17:51:12 -04:00
c0bd256178
Makes revs have a min pop needed
...
Needs 20 players min to make sure there is a Head and at lest one sec officer more then likely
2018-07-13 11:32:47 -04:00
c8b9e94d1e
Merge pull request #7354 from Trilbyspaceclone/patch-6
...
Removes armor form Non-head only Trek suits
2018-07-10 02:04:18 -04:00
914967f081
Merge pull request #7356 from Trilbyspaceclone/WT-550
...
Hopefully this will add in the missing WT-550 Toxin Ammo for sec
2018-07-10 02:03:08 -04:00
1145a66ec3
Merge pull request #7345 from LetterN/patch-5
...
adds plushnar and plushvar on chapvendors
2018-07-10 02:01:21 -04:00
fc9b99173b
Merge pull request #7344 from LetterN/fix-1
...
fixes lewd handcuffs
2018-07-10 01:59:36 -04:00
c1ae3a7ba6
fixes democracy
2018-07-07 14:10:32 -04:00
00f84818a1
Remove spaces at the ends of the paths
...
Ima dork and forgot to remove those
2018-07-07 09:13:23 -04:00
1e31149039
Removes the //Cit Change
2018-07-07 00:48:04 -04:00
7f9365e1db
Modularized, plz dont yell at me
2018-07-06 17:42:24 -04:00
54779cae1d
Modularized, plz dont yell at me
2018-07-06 17:37:50 -04:00
71c259b0c4
MoModularized, plz don't yell at me
2018-07-06 17:33:07 -04:00
0b0820937d
Update trek_under.dm
2018-07-06 14:03:04 -04:00
114c53c4f2
Removes armor form Non-head only suits
...
Basically get better armored suits then sec do!
2018-07-06 13:46:24 -04:00
c258941098
Update vending.dm
2018-07-06 17:26:55 +08:00
5c79a794ec
Update holy_weapons.dm
2018-07-06 17:20:30 +08:00
bff55cc362
Update handcuffs.dm
2018-07-06 17:19:56 +08:00
981743a170
Update custom_items.dm
2018-07-06 00:54:21 -05:00
5ad7fc35fd
Update __donator.dm
2018-07-06 00:54:01 -05:00
a64dba6270
Merge branch 'flagcape'
...
# Conflicts:
# icons/obj/custom.dmi
# modular_citadel/code/modules/client/loadout/__donator.dm
# modular_citadel/code/modules/custom_loadout/custom_items.dm
2018-07-06 00:51:42 -05:00
b245b940a4
Update custom_items.dm
2018-07-06 00:46:48 -05:00
5cacbfbe2e
Merge branch 'flagcape' of https://github.com/Citadel-Station-13/Citadel-Station-13 into flagcape
...
# Conflicts:
# modular_citadel/code/modules/custom_loadout/custom_items.dm
2018-07-06 00:45:52 -05:00
637c64f55b
fuk
2018-07-06 00:42:25 -05:00
5f4e19000d
Merge pull request #7308 from Citadel-Station-13/kevinz000-patch-9
...
protects load_mentors from accidental wipe due to advproccall interrupting sql operations
2018-07-06 01:40:20 -04:00
deathride58