Commit Graph

10365 Commits

Author SHA1 Message Date
deathride58
19d09b4b2d Merge pull request #6697 from Citadel-Station-13/upstream-merge-37718
[MIRROR] Distinguish between DNA and ID when failing to enter a mech
2018-05-11 03:39:50 +00:00
deathride58
852d2a529e Merge pull request #6698 from Citadel-Station-13/upstream-merge-37548
[MIRROR] fixes some inconsistency in the bulldog shotgun ammo
2018-05-11 03:39:31 +00:00
deathride58
93aa92820d Merge pull request #6701 from Citadel-Station-13/upstream-merge-37770
[MIRROR] Fixes anomalies not listening on the correct frequency
2018-05-11 03:38:38 +00:00
deathride58
e0bceb405f Merge pull request #6702 from Citadel-Station-13/upstream-merge-37735
[MIRROR] improves pda message immersion
2018-05-11 03:36:22 +00:00
deathride58
b38424653c Merge pull request #6703 from Citadel-Station-13/upstream-merge-37656
[MIRROR] Fixes EMPs not working on people/backpacks/other storage being carried on people
2018-05-11 03:36:01 +00:00
deathride58
d0dc769b53 Merge pull request #6705 from Citadel-Station-13/upstream-merge-37726
[MIRROR] Stops qdeleted objects from taking damage.
2018-05-11 03:35:35 +00:00
deathride58
0ec6c3f853 Merge pull request #6708 from Citadel-Station-13/upstream-merge-37761
[MIRROR] Adds time_dilation info to status topic.
2018-05-11 03:34:21 +00:00
deathride58
f2e7c305a5 Merge pull request #6709 from Citadel-Station-13/upstream-merge-37748
[MIRROR] brings gender equality on /tg/station
2018-05-11 03:33:57 +00:00
YPOQ
afe80d808b Fixes gorillas not having hand slots (#37762) 2018-05-10 20:52:38 -05:00
Tlaltecuhtli
4a8df6a701 Bring gender equality to Corgi crates (#37748)
* brings gender equality on /tg/station
* what if this works
2018-05-10 19:57:20 -05:00
Jordan Brown
ed41769e10 Merge pull request #37761 from MrStonedOne/patch-503
Adds time_dilation info to status topic.
2018-05-10 15:50:59 -05:00
LetterJay
8948acfce2 Merge pull request #6691 from Citadel-Station-13/upstream-merge-37753
[MIRROR] Makes the cultblade use the right inhand files
2018-05-10 10:12:56 -05:00
LetterJay
0e27471a77 Merge pull request #6690 from Citadel-Station-13/upstream-merge-37704
[MIRROR] Adds drone hats for some holidays
2018-05-10 10:12:08 -05:00
AnturK
096a8a63c5 Stops qdeleted objects from taking damage. (#37726)
* Stops qdeleted objects from taking damage.

* Some logging.
2018-05-10 02:30:01 -05:00
kevinz000
3819a5a9b5 Fixes EMPs (#37656) 2018-05-10 01:33:25 -05:00
Iamgoofball
278ecd5d06 improves pda message immersion (#37735) 2018-05-10 01:08:37 -05:00
LetterJay
4533b983f6 Merge pull request #6689 from Citadel-Station-13/upstream-merge-37693
[MIRROR] Fixes singuloth not disappearing after a set amount of time.
2018-05-10 00:49:06 -05:00
LetterJay
dd25b15115 Merge pull request #6688 from Citadel-Station-13/upstream-merge-37721
[MIRROR] Fixes edge case with crew pinpointers
2018-05-10 00:46:38 -05:00
YPOQ
f459f909c0 Fixes anomalies not listening on the correct frequency 2018-05-09 22:45:09 -05:00
Tlaltecuhtli
325b31f11e fixes some inconsistency in the bulldog shotgun ammo (#37548)
the default bulldog shotgun ammo makes sense now
2018-05-09 16:24:17 -05:00
Tad Hardesty
a1db36f316 Distinguish between DNA and ID when failing to enter a mech 2018-05-09 16:22:03 -05:00
Lexorion
2c33868d8a makes the cultblade use the right inhand files 2018-05-09 15:48:40 -05:00
Denton
6edd272d76 drone masks for holidays 2018-05-09 13:42:54 -05:00
Dax Dupont
b29f399157 Fixes singuloth not disappeared after a set amount of time. 2018-05-09 13:42:44 -05:00
kevinz000
566ca84c21 edge case 2018-05-09 13:41:28 -05:00
Tlaltecuhtli
51b6a296d3 fixes a money loop
🆑 
fix: fixes a possible money exploit
/🆑

why: if you buy the barrier crate, open it, spam all the grenades in vertical mode u ll get more money that the crate is worth
before: 4 grenades -> 12 barriers * 375 credits -> 4500 + 500 (crate) + 200 (manifest) -> 5200 which is a +3200 net gain
now:  4 grenades -> 12 barriers * 100 credits -> 1200+ 500 (crate) + 200 (manifest) -> 1900 which is a -100 net loss
2018-05-09 13:40:13 -05:00
Naksu
eb4743e5a9 every fucking time 2018-05-08 09:21:36 -05:00
deathride58
37d65a54ff Merge pull request #6666 from Citadel-Station-13/upstream-merge-37632
[MIRROR] Shows assemblies some love. ♥
2018-05-07 19:41:21 +00:00
kevinz000
9d39b2859a Geiger counters can now scan the radiation of anything! (#37688) 2018-05-07 13:51:26 -05:00
LetterJay
5d18d53566 Merge pull request #6673 from Citadel-Station-13/kevinz000-patch-2
Allows anyone to reboot on OOM situations
2018-05-07 09:20:59 -05:00
LetterJay
893783188f Merge pull request #6672 from Citadel-Station-13/kevinz000-patch-1
tesla coil runtime fix
2018-05-07 09:20:42 -05:00
deathride58
be42e97101 Update helpers.dm 2018-05-07 08:47:44 -04:00
deathride58
5d38c10581 Merge pull request #6661 from Citadel-Station-13/upstream-merge-37712
[MIRROR] Fixes a radiation runtime related to going off the map edge
2018-05-07 12:46:00 +00:00
deathride58
f15f3ffea4 Merge pull request #6662 from Citadel-Station-13/upstream-merge-37648
[MIRROR] Moves removing the cell to screwdriver_act for APCs
2018-05-07 12:45:42 +00:00
deathride58
e3ad766f33 Merge pull request #6664 from Citadel-Station-13/upstream-merge-37668
[MIRROR] Axes the robotic fabricator (not the exofab)
2018-05-07 12:45:09 +00:00
deathride58
9b7518e1e2 Merge pull request #6665 from Citadel-Station-13/upstream-merge-37578
[MIRROR] Fix the top menus in the skin not working
2018-05-07 12:44:35 +00:00
deathride58
8bc97a10d6 Merge pull request #6667 from Citadel-Station-13/upstream-merge-37676
[MIRROR] Prevents electric grills from mass producing lightning through exploits
2018-05-07 12:44:12 +00:00
deathride58
757cd6aa73 Merge pull request #6668 from Citadel-Station-13/upstream-merge-37680
[MIRROR] Improves skittish code
2018-05-07 12:43:47 +00:00
deathride58
d897dd5182 Merge pull request #6669 from Citadel-Station-13/upstream-merge-37681
[MIRROR] Fixes supply pod duping
2018-05-07 12:43:16 +00:00
deathride58
ab07f4a878 Merge pull request #6670 from Citadel-Station-13/upstream-merge-37679
[MIRROR] Fixes rhumba beat as requested by naksu
2018-05-07 12:42:57 +00:00
kevinz000
79d0a12884 Allows anyone to reboot on OOM situations 2018-05-07 03:07:09 -07:00
kevinz000
33e6ef93f1 runtime fix 2018-05-06 20:17:15 -07:00
deathride58
034bf6ce79 Update verbs.dm 2018-05-06 17:38:25 -04:00
deathride58
06fc24e953 Makes it plausible for the lone operative event to roll if the nuclear disk stays still for long enough (#37468)
* makes it possible for the lone operative event to roll if the nuclear disk stays still for long enough

* makes the event weight increase chance reset if the disk moves

* slows this shit *WAY* down, adds a minimum time for the weight to start rolling for an increase (approximately 10 minutes)

* .

* this was an absolute pain in the ass to test - addresses reviews

* addresses ninjanomnom's review, makes it possible for the loneop event weight to decrease if the disk moves
2018-05-06 16:38:25 -05:00
vuonojenmustaturska
0d7a0c0418 Merge pull request #37679 from DaxDupont/death
Fixes rhumba beat as requested by naksu
2018-05-06 16:38:16 -05:00
vuonojenmustaturska
4b36831fbe Merge pull request #37681 from kevinz000/patch-499
Fixes supply pod duping
2018-05-06 16:38:08 -05:00
vuonojenmustaturska
8e791af911 Merge pull request #37680 from kevinz000/patch-498
Improves skittish code
2018-05-06 16:37:57 -05:00
vuonojenmustaturska
ed41503127 Merge pull request #37676 from AverageJoe82/electric-grill-engine
Prevents electric grills from mass producing lightning through exploits
2018-05-06 16:37:49 -05:00
ShizCalev
6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
Tad Hardesty
af5e898dab Fix the top menus in the skin not working 2018-05-06 16:37:31 -05:00