cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,310 Commits 55 Branches 0 Tags
d45b668a390ca0c97cf4df7315cf51a892731414
Commit Graph

6917 Commits

Author SHA1 Message Date
Jordan Brown
e36f4a5b22 SendSignal optimization 2017-12-04 05:29:56 -06:00
AnturK
2587b99a69 Adds quiet argument to playsound. (#33185) 
* Adds quiet argument to playsound.

* argument name change
 2017-12-04 05:28:43 -06:00
AnturK
1cc3e33714 Holorecord disks. 2017-12-04 05:14:13 -06:00
Ashe Higgs
3689b3d5fd Mechs now require fuel to repair (#33225) 2017-12-04 04:55:25 -06:00
ACCount
00279c71f0 IC fixes (#33215) 2017-12-04 04:53:12 -06:00
QualityVan
4f8323a735 Fixes missing eyes being absent (#33203) 2017-12-04 04:50:55 -06:00
LetterJay
985c8ea86b donation 2017-12-04 02:14:16 -06:00
Jordan Brown
2393b7759b People jitter when revived by defibs 2017-12-03 20:19:44 -06:00
deathride58
65d5c779c3 Merge pull request #4203 from Citadel-Station-13/upstream-merge-33217 
[MIRROR] Makes ahelp timestamps consistent with logs
 2017-12-03 23:33:17 +00:00
deathride58
d9ca1d6831 Merge pull request #4201 from Citadel-Station-13/upstream-merge-33224 
[MIRROR] Plasma statues get fixed
 2017-12-03 23:30:01 +00:00
deathride58
e42fa29e96 Merge pull request #4200 from Citadel-Station-13/upstream-merge-33204 
[MIRROR] Being buckled to a bed now saves you from "the floor is lava"
 2017-12-03 23:29:42 +00:00
deathride58
222346bf30 Update say.dm 2017-12-03 18:29:08 -05:00
deathride58
4d29723302 Update lighting.dm 2017-12-03 18:25:54 -05:00
deathride58
fc132ff72a Merge pull request #4197 from Citadel-Station-13/upstream-merge-33219 
[MIRROR] Crash to timers and INFINITY check to beams.
 2017-12-03 23:24:53 +00:00
deathride58
1e6716f91b Merge pull request #4196 from Citadel-Station-13/upstream-merge-33214 
[MIRROR] spellcheck weapon firing mechanism description
 2017-12-03 23:23:30 +00:00
deathride58
a376c25790 Merge pull request #4194 from Citadel-Station-13/upstream-merge-33202 
[MIRROR] Revolutionaries can now see deconversion message regardless of status
 2017-12-03 23:23:01 +00:00
deathride58
51f07eb65a Merge pull request #4191 from Citadel-Station-13/upstream-merge-33189 
[MIRROR] Fixes spelling error in opened cryogenic pods.
 2017-12-03 23:21:28 +00:00
deathride58
a95b5a2b91 Merge pull request #4171 from Citadel-Station-13/upstream-merge-33144 
[MIRROR] Fix turbine computer showing broken
 2017-12-03 23:20:40 +00:00
Leo
c0547bea4b Merge pull request #33217 from tgstation/Cyberboss-patch-3 
Makes ahelp timestamps consistent with logs
 2017-12-03 16:07:30 -06:00
kevinz000
66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
Robustin
a575e2668d Plasma statues get fixed (#33224) 
* Plasma statues fix

* Actually a fix

* brackets
 2017-12-03 13:16:45 -06:00
ExcessiveUseOfCobblestone
0df9db51f3 Being buckled to a bed now saves you from "the floor is lava" (#33204) 
* Update floor_is_lava.dm

* Switcheroo

* )))))))))))))
 2017-12-03 13:16:37 -06:00
MoreRobustThanYou
29ba71765c Datumizes saymodes 2017-12-03 12:56:03 -06:00
Ashe Higgs
5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -06:00
jammer312
b1e15a0da2 Crash to timers and INFINITY check to beams. (#33219) 
* beams

* timers

* >= instead of !=

* whooops
 2017-12-03 12:45:27 -06:00
checkraisefold
96a064258f Spellcheck (#33214) 2017-12-03 12:42:10 -06:00
LetterJay
6217206bae Merge pull request #4189 from Citadel-Station-13/upstream-merge-33180 
[MIRROR] cardboard no longer can damage you
 2017-12-03 06:16:00 -06:00
LetterJay
c5f0b380cd Merge pull request #4186 from Citadel-Station-13/upstream-merge-33157 
[MIRROR] Clean up some loc assignments
 2017-12-03 06:14:34 -06:00
LetterJay
b2f1359795 Merge pull request #4185 from Citadel-Station-13/upstream-merge-33197 
[MIRROR] Fixes syndieborg spawner
 2017-12-03 06:14:25 -06:00
LetterJay
dd99e8305a Update plushes.dm 2017-12-03 06:14:14 -06:00
LetterJay
6fe319af5a Merge pull request #4183 from Citadel-Station-13/upstream-merge-33191 
[MIRROR] Fixes a division by zero in humans' ex_act()
 2017-12-03 06:13:43 -06:00
LetterJay
bf64a40e8f Merge pull request #4182 from Citadel-Station-13/upstream-merge-33199 
[MIRROR] Prevents the PA from being EMP'd
 2017-12-03 06:12:15 -06:00
LetterJay
6f9431a893 Merge pull request #4180 from Citadel-Station-13/upstream-merge-33192 
[MIRROR] Fixes terrible Flash logic
 2017-12-03 06:11:18 -06:00
LetterJay
43ae67e83d Merge pull request #4178 from Citadel-Station-13/upstream-merge-33186 
[MIRROR] Bitflag returns from component signals
 2017-12-03 06:10:54 -06:00
LetterJay
d7cb8da956 Merge pull request #4177 from Citadel-Station-13/upstream-merge-33159 
[MIRROR] Ratvar will now bitchslap BOH babies
 2017-12-03 06:10:34 -06:00
LetterJay
163e5648b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-12-03 06:07:36 -06:00
LetterJay
03b7839e41 donation fix 2017-12-03 06:07:20 -06:00
LetterJay
624b570763 Merge pull request #4173 from Citadel-Station-13/upstream-merge-33120 
[MIRROR] Makes glasses handle both nearsightedness and eye damage
 2017-12-03 06:06:33 -06:00
ExcessiveUseOfCobblestone
ae5221371f Revolutionaries can now see deconversion message regardless of status (#33202) 2017-12-02 17:47:30 -06:00
BeeSting12
8017aac116 Fixes spelling error in opened cryogenic pods. (#33189) 2017-12-02 09:45:07 -06:00
Leo
4723a1813b Merge pull request #33180 from praisenarsie/patch-13 
cardboard no longer can damage you
 2017-12-02 09:44:47 -06:00
vuonojenmustaturska
9f9582ba5e Clean up some loc assignments (#33157) 2017-12-02 09:44:20 -06:00
AnturK
18c01d88c5 Fixes syndieborg spawner 2017-12-02 09:44:11 -06:00
CosmicScientist
7be54897b2 Plushie relationships! 2017-12-02 09:44:02 -06:00
Jordan Brown
4489843fd6 Merge pull request #33191 from vuonojenmustaturska/bombmemes 
Fixes a division by zero in humans' ex_act()
 2017-12-02 09:43:51 -06:00
FrozenGuy5
65dbabab89 Prevents the PA wires from being EMP'd (#33199) 
* returns emp_act

* jordie for code owner
 2017-12-02 09:43:42 -06:00
Jordan Brown
ee8ca86e3a Merge pull request #33192 from Robustin/SavioroftheUniverse 
Fixes terrible Flash logic
 2017-12-02 09:43:25 -06:00
Emmett Gaines
b8e754500c Bitflag returns from component signals (#33186) 
* For more useful returns from sendsignal

* removes a needless else/indentation

* cleanup
 2017-12-01 13:09:22 -06:00
Robustin
786c26fa97 Ratvar will now bitchslap BOH babies (#33159) 
* Singuloproofing Reebe

* Message reformatted

* Inconsistent Indentification

* user is now living so we can knock them down
 2017-12-01 11:58:30 -06:00
Michiyamenotehifunana
867810ab8c massive overhaul of RGB stuff and massive additions 
halp
 2017-12-02 00:06:42 +08:00