 Thalpy
|
b8028242c0
|
Compile fixes
|
2019-06-28 17:16:21 +01:00 |
|
|
Thalpy
|
4b7ac0be79
|
More fun ssblackbox tallies.
|
2019-06-28 16:50:48 +01:00 |
|
|
Ghommie
|
db0d1ae565
|
Applying requested changes.
|
2019-06-28 17:25:47 +02:00 |
|
|
deathride58
|
fb66d382fa
|
Merge pull request #8727 from Ghommie/Ghommie-cit78
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
|
2019-06-28 00:47:09 -04:00 |
|
|
deathride58
|
db6e8ecd4c
|
Merge pull request #8755 from Poojawa/the-balls-should-be-inert
Fixes errant ball behaviour
|
2019-06-28 00:23:37 -04:00 |
|
|
Ghommie
|
17371196ee
|
Prevents the shuttle from being recalled (even if to no avail).
|
2019-06-27 16:51:14 +02:00 |
|
|
Ghommie
|
45467acdaf
|
..
|
2019-06-27 04:31:40 +02:00 |
|
|
Ghommie
|
17072eb809
|
.
|
2019-06-27 04:29:27 +02:00 |
|
|
Ghommie
|
e61f13634e
|
Merging the end-of-shift and its shuttle call announcements into one.
|
2019-06-27 04:23:14 +02:00 |
|
|
Thalpy
|
a2a5bbdb11
|
Found the "the floor" message admin!
|
2019-06-26 19:40:46 +01:00 |
|
|
Sishen
|
7813536d78
|
might as well add breast shapes to the mix
|
2019-06-26 09:50:35 -04:00 |
|
|
Poojawa
|
00a630abe5
|
Fixes errant ball behaviour
|
2019-06-26 07:42:02 -05:00 |
|
|
Fermi
|
afe43070a0
|
Improved logging and renamed buffer IDs
|
2019-06-26 12:20:10 +01:00 |
|
|
Fermi
|
0954f0f50c
|
This is why you always compile test before merging.
|
2019-06-26 12:07:21 +01:00 |
|
|
Fermi
|
fbf54cd560
|
Ninja fix.
|
2019-06-26 12:01:26 +01:00 |
|
|
Sishen
|
4d51214526
|
and tool length and breast size too
|
2019-06-25 22:36:36 -04:00 |
|
|
Sishen
|
2736596293
|
Morphing Genitalia!
|
2019-06-25 22:03:10 -04:00 |
|
|
Fermi
|
19b79b8232
|
The great botany purge of our time.
|
2019-06-26 01:29:34 +01:00 |
|
|
Fermi
|
a53ca38eb9
|
Lil fix
|
2019-06-25 23:54:23 +01:00 |
|
|
Fermi
|
e4e3932eb3
|
Sprites
|
2019-06-25 23:46:42 +01:00 |
|
|
Fermi
|
1ad92b9758
|
Final round of fixes from testing.
|
2019-06-25 23:44:04 +01:00 |
|
|
Fermi
|
1f0dec53ff
|
Fixed wrong chem
|
2019-06-25 23:13:22 +01:00 |
|
|
Fermi
|
3ccf300052
|
Fixed empty hypovial
|
2019-06-25 23:11:43 +01:00 |
|
|
Fermi
|
3928e027b4
|
Fixes (see dev discussion)
|
2019-06-25 23:06:55 +01:00 |
|
|
LetterJay
|
5f99d9ec04
|
Fixes wrong item path for donator loadout
|
2019-06-25 09:50:35 -05:00 |
|
|
TrilbySpaceClone
|
e84fd8942f
|
fix
|
2019-06-25 03:08:40 -04:00 |
|
|
Trilbyspaceclone
|
52f100998c
|
Update custom_items.dm
|
2019-06-25 02:59:49 -04:00 |
|
|
Fermi
|
eb2dc63a54
|
Oh nooooo I forgot to save!!!
|
2019-06-25 07:50:44 +01:00 |
|
|
Fermi
|
4145b0f256
|
Hotfix for egregious oversights.
|
2019-06-25 07:22:20 +01:00 |
|
|
TrilbySpaceClone
|
50aede119b
|
all works
|
2019-06-25 01:50:35 -04:00 |
|
|
Ghommie
|
67f00fc049
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42
|
2019-06-24 16:48:15 +02:00 |
|
|
Fermi
|
8605d3a246
|
Found a pH overflow.
|
2019-06-24 15:06:18 +01:00 |
|
|
TrilbySpaceClone
|
b485d8e750
|
Saves jay the trouble
Im a good cat
|
2019-06-24 02:21:04 -04:00 |
|
|
kevinz000
|
69d48c5e5e
|
Merge pull request #8736 from Trilbyspaceclone/Poojawa_How_Do_I_Update_My_Shit
Removes Nudity Permits and replaces them with invisible gear harnesses
|
2019-06-23 17:26:30 -07:00 |
|
|
Fermi
|
26cd24a79d
|
Tweaked reagent colours.
|
2019-06-23 20:33:07 +01:00 |
|
|
Fermi
|
fdba8c000f
|
Fixing compiling errors.
|
2019-06-23 20:03:37 +01:00 |
|
|
Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
|
Fermi
|
b309490190
|
Forgot to ctrl+s
|
2019-06-23 19:02:53 +01:00 |
|
|
kevinz000
|
dcab96d9d5
|
Merge pull request #8721 from Ghommie/Ghommie-cit77
Ports in "Liver removal/failure now also stops passive reagent effects"
|
2019-06-23 06:53:30 -07:00 |
|
|
kevinz000
|
df70e135bd
|
Merge pull request #8711 from Ghommie/Ghommie-cit75
Greytide Stationwide!
|
2019-06-23 06:52:05 -07:00 |
|
|
kevinz000
|
228df53c99
|
Merge pull request #8698 from Ghommie/Ghommie-cit72
Fixes "Penlights Cannot Give Eye Exams"
|
2019-06-23 06:41:03 -07:00 |
|
|
Ghom
|
41bd3caf3c
|
Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669)
* Ports "Reorganizes the uplink, adds grenades and explosives category."
* Unbent codex, singing the sorrow of aborted spoils.
* .
|
2019-06-23 06:00:27 -07:00 |
|
|
Sishen1542
|
2bb56a900a
|
Dab emote now checks restraint flags. (#8672)
* Update cit_emotes.dm
* Revert "Update cit_emotes.dm"
This reverts commit 649007667db6f7d1fdd0f30e99bbaa268fbeb03c.
* Revert "Revert "Update cit_emotes.dm""
This reverts commit 7950f642bf32b4179d265fdb498451c3e05a10fe.
|
2019-06-23 06:00:07 -07:00 |
|
|
Fermi
|
7c19f5e0fa
|
Forgot to comment out hypnoquirk.
|
2019-06-23 13:06:45 +01:00 |
|
|
Trilbyspaceclone
|
4278284e7b
|
Merge branch 'master' into Poojawa_How_Do_I_Update_My_Shit
|
2019-06-23 01:52:59 -04:00 |
|
|
TrilbySpaseClone
|
7f4d60ae25
|
Poojawa this would been easyer with webedits
|
2019-06-23 01:49:45 -04:00 |
|
|
Fermi
|
f7696041ca
|
Fumblefingered some numbers.
|
2019-06-23 03:43:36 +01:00 |
|
|
Fermi
|
537161dd01
|
Lil flavour tweaks.
|
2019-06-23 03:22:54 +01:00 |
|
|
Fermi
|
21c17813b8
|
Guess who should've compile tested!
|
2019-06-23 01:20:11 +01:00 |
|
|
Ghommie
|
38bc8a4efd
|
Ports "Removes SSreligion"
|
2019-06-23 01:45:21 +02:00 |
|