Commit Graph

29934 Commits

Author SHA1 Message Date
tigercat2000
eea5233d82 Convert phazon damtype to action button (missed thsi whoopsies) 2018-11-02 01:07:50 -07:00
tigercat2000
b370858fc8 Fixes Phazon movespeed, add radial menus to ctrl
Ctrl Clicking on a mech while you're in it will now bring up a radial
weapon selection
2018-11-02 00:46:08 -07:00
tigercat2000
d6a852bcfa Merge remote-tracking branch 'upstream/master' into mechastuff
# Conflicts:
#	code/game/mecha/mecha.dm
2018-11-01 08:37:46 -07:00
variableundefined
acb594f965 Merge pull request #10051 from farie82/Mech-repair
Mechs now can't be spam repaired
2018-11-01 22:55:38 +08:00
variableundefined
aaffaedb37 Merge pull request #10057 from warior4356/drone-death
Solves ghosts re-entering shutdown drones by making the ghost unable to reenter corpses
2018-11-01 16:16:48 +08:00
variableundefined
3cc5e7bcd8 Merge pull request #10085 from Mitchs98/headslugfix
Changelings can no longer escape lockers VIA Headslug
2018-11-01 14:38:44 +08:00
Mitchell
91fb53351f Removes user.loc 2018-11-01 01:25:17 -05:00
Mitchell
5a9a966f03 Fixes #10083 2018-11-01 00:04:01 -05:00
variableundefined
e2b9a51085 Merge pull request #10084 from Mitchs98/poolspamfix
Reduces Pool Temp Spam
2018-11-01 10:15:02 +08:00
Mitchell
c973807251 Reduces Pool Temp Spam 2018-10-31 21:00:42 -05:00
variableundefined
05b8b3fa91 Merge pull request #10071 from shazbot194/illegal_borg_desc
Updates desciption on illegal borg upgrades
2018-11-01 09:14:56 +08:00
variableundefined
401f639870 Merge pull request #10079 from Citinited/aaaaa
Kills another disposals nullspace bug
2018-11-01 07:15:35 +08:00
Citinited
1af2c7cb14 kills another nullspace bug 2018-10-31 22:08:54 +00:00
joep van der velden
65675b6c8b spacing! 2018-10-31 19:23:16 +01:00
joep van der velden
f9a9b09616 Put in tigers code 2018-10-31 19:20:48 +01:00
Arkatos1
9aed1d6697 Fixes Rewriter drink description typo 2018-10-31 14:23:04 +01:00
tigercat2000
6028fc83c3 Not quite done yet 2018-10-30 22:57:42 -07:00
shazbot194
5d43617825 Shadey's nitpick 2018-10-30 20:24:12 -08:00
shazbot194
ff961c609f Updated 2018-10-30 19:44:32 -08:00
warior4356
c6249d89f5 Fixed by not allowing ghost to reenter corpse. 2018-10-30 19:06:23 -07:00
warior4356
c3236e84ac Revert "Makes drone gib on shutdown"
This reverts commit 8860b285ff.
2018-10-30 18:50:32 -07:00
variableundefined
f7481c6f6e Merge pull request #10055 from Jountax/master
Renames Ice Peppers to Chilly Peppers
2018-10-31 07:49:48 +08:00
TatsumakiMagi
6f07fd668a Fixes adjacency issues with merch shop, arcade shop and give command 2018-10-30 23:21:57 +00:00
variableundefined
ba6c5acf99 Merge pull request #10009 from alex-gh/tabling_exploit_fix
Fixed tabling through solid objects.
2018-10-30 21:34:15 +08:00
variableundefined
ed30ce21fa Merge pull request #10029 from farie82/oil-dispenser
Gives cargo the ability to buy an Oil tank.
2018-10-30 20:55:14 +08:00
alex-gh
9b6f1248c6 Fixed tabling through solid objects. 2018-10-30 12:36:30 +01:00
farie82
f03aea80f5 Set the repairing to 20 2018-10-30 08:51:29 +01:00
variableundefined
4778d4de5d Merge pull request #10062 from Dave-TH/paper_fix
Paper Bundles No Longer Automatically Display Their Contents
2018-10-30 10:53:58 +08:00
Unknown
f4d5f73261 Fixes Paper Bundles Bug 2018-10-29 21:31:49 -04:00
warior4356
6bbfd38148 Fixes silicons pressing door buttons and doors not opening. 2018-10-29 17:56:38 -07:00
variableundefined
a6b76bd701 Merge pull request #10058 from warior4356/Drone-ID
Fixes ID based runtime on shutting down drones
2018-10-30 08:09:11 +08:00
variableundefined
3d0a7a56aa Merge pull request #10056 from warior4356/drunk-megaphone
Adds speech impediment handling to megaphones
2018-10-30 07:59:11 +08:00
warior4356
028b53b055 Fixes ID based runtime on shutting down drones 2018-10-29 16:56:09 -07:00
warior4356
8860b285ff Makes drone gib on shutdown 2018-10-29 14:55:14 -07:00
warior4356
8a0767a88a Adds speach impediment handling to megaphones 2018-10-29 14:33:35 -07:00
Jountax
eb182aa1fb Update chili.dm 2018-10-29 16:12:28 -04:00
Jountax
2e2af221fa Update chili.dm 2018-10-29 15:31:23 -04:00
joep van der velden
07e419a8a4 Items dropped in a pod will now stay in the pod. 2018-10-29 20:31:11 +01:00
joep van der velden
b5b3fca2af Mechs can now only be repaired once every 1.5 seconds 2018-10-29 20:01:22 +01:00
variableundefined
6e7b672ec8 Merge pull request #9975 from Citinited/assembly-code-cleanup
Assembly devices minor refactor & code cleanup
2018-10-29 22:00:13 +08:00
variableundefined
83fdc7f2db Merge pull request #10043 from Squirgenheimer/mechafixes
Two mech bug fixes (deletion runtime and speech bubbles)
2018-10-29 21:29:04 +08:00
variableundefined
eafc4ec937 Merge pull request #10045 from Squirgenheimer/miningsatchelfix
fixed number of mining satchel slots
2018-10-29 21:25:06 +08:00
Squirgenheimer
687d2c8f0f changed number of mining satchel slots to 10 2018-10-29 05:17:50 -04:00
Squirgenheimer
c6da75590c say code correction
-we should be using the loc of the mob to create a speech bubble, not the loc of the loc of the mob
-speech bubbles created by mobs inside a mech will now follow the mech
2018-10-29 03:43:04 -04:00
Squirgenheimer
926c4a5e17 fixes deleting mechs causing a runtime
-removed unnecessary code handled by detach()
2018-10-29 01:39:48 -04:00
variableundefined
5e87e2e984 Merge pull request #10037 from farie82/Round-start-time-config
Made the round start time variable using the config.txt
2018-10-29 10:30:15 +08:00
variableundefined
cd553f1be6 Merge pull request #10028 from SomeSortaSquid/master
Fix for Airlocks Shocking Remotely
2018-10-29 08:00:16 +08:00
joep van der velden
b332cda61d Made the round start time variable using the config.txt 2018-10-28 20:24:56 +01:00
tigercat2000
a5bfc7df1e Merge pull request #10033 from alex-gh/ticker_delay_fix
Fixes shadowling game mode delaying the game ticker
2018-10-28 10:10:29 -07:00
alex-gh
d6d8e4b757 Fixed shadowling gamemode delaying the game ticker 2018-10-28 16:54:20 +01:00