Tigercat2000
ebcc4edcef
Shuttles: P2, Escape Pods n' Fixes
2015-12-07 14:27:37 -08:00
Tigercat2000
85d4f59caf
Wow. Soft merge conflicts, in a way. Merging not causing a git error, but
...
instead, a compile error. Congrats TRAVIS, you are smarter than your
average CI.
2015-12-04 22:32:38 -08:00
Tigercat2000
79ce26684d
Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
2015-12-04 22:29:29 -08:00
Tigercat2000
c3f476f62c
Supply shuttle, initial_move() fixes, dock fixes
...
Supply has been almost completely replaced by -tg-'s system.
No fancy UI, unfortunately, but modifying bay's directly was not possible.
2015-12-04 21:48:40 -08:00
Fox McCloud
dc089e3146
Merge pull request #2712 from Crazylemon64/mecha_mmi_fix
...
Mecha mmi Tweaks and Fix
2015-12-04 19:23:53 -05:00
TheDZD
b0fd240083
Merge pull request #2721 from ZomgPonies/222
...
Nations 2.2.2
2015-12-04 16:05:18 -05:00
Crazylemon64
9809a5fc1b
Lots of cool fixes! Read below!
...
- Radio MMIs can now talk on the radio like a regular person does
- Same for MMIs in mechs
- A posibrain in a mecha doesn't lose its ability to hear binary chat
- Mechs now consume power when moving again
- Disassembling mecha wreckage now doesn't have a bunch of annoying "hit
by" messages
- MMIs in someone's grasp no longer cause a rigsuit-related runtime
2015-12-03 23:46:10 -08:00
Fox McCloud
4a328a2d76
Merge pull request #2715 from Aurorablade/GuardianStuff
...
Guardian Fixes/tweaks
2015-12-04 00:14:39 -05:00
Aurorablade
96e3f1a1b9
URK
2015-12-03 23:57:29 -05:00
ZomgPonies
6e67dfd33a
Fixes borg issues
2015-12-03 18:06:49 -05:00
Fox McCloud
a4b36540d8
Merge pull request #2706 from Crazylemon64/reclaimer_plasglass
...
Lets the ore reclaimer make plasma glass from plasma and glass
2015-12-03 17:43:11 -05:00
Aurorablade
ec61de0a20
Star Fox told me some things i couldn't do..i fixeded them.
2015-12-03 15:11:42 -05:00
Tigercat2000
356835aa99
Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
...
Conflicts:
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/malfunction/malfunction.dm
code/game/gamemodes/revolution/revolution.dm
code/modules/admin/verbs/randomverbs.dm
2015-12-03 11:03:01 -08:00
Tigercat2000
e60799474b
tgshuttles unfinished
2015-12-03 10:59:06 -08:00
Aurorablade
69e2567e74
Trying to figure outwhy admin version is not working
2015-12-03 02:00:55 -05:00
TheDZD
3f72596e62
Merge pull request #2612 from Aurorablade/Guardingthings
...
Fethas Carnival of Horrors part 4: I am in your greytide guarding ur newbs
2015-12-02 21:21:22 -05:00
Aurorablade
7d6b6f9436
RAWRRGHHHH
...
FUCKING DEBUG PRINT
RAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHH
2015-12-02 21:06:13 -05:00
Aurorablade
e543062396
PAWNCYPAUNCH
2015-12-02 20:57:32 -05:00
TheDZD
2274c1806d
Merge pull request #2696 from ZomgPonies/mecha
...
Speech Bubble fixes
2015-12-02 19:43:47 -05:00
TheDZD
07021e506b
Merge pull request #2699 from Fox-McCloud/botany-qol
...
Botany QoL Changes
2015-12-02 19:15:17 -05:00
TheDZD
cd3ce35f07
Merge pull request #2701 from Fox-McCloud/phlog-tweak
...
Phlog Nerf/Balance
2015-12-02 19:15:12 -05:00
TheDZD
cf18c90b94
Merge pull request #2710 from Fox-McCloud/player-spider-fixes
...
Player Spider Fixes
2015-12-02 19:02:23 -05:00
Fox-McCloud
82312c9e52
Player Spider Fixes
2015-12-02 18:14:01 -05:00
Crazylemon
13e2436934
Gives MMI Odysseus' medhuds, adds mech wreckage disassembly
...
MMIs can also be extracted without destroying the mech should they
permit maintenance protocols
2015-12-02 13:30:07 -08:00
Crazylemon
c41140c636
This should let MMI mechs move again
...
Need to give this a test, but it looks like the else case of the mecha
check was hijacked by the MMI check, which then prevented brains in a
mech from moving
2015-12-02 09:30:03 -08:00
Crazylemon
b12ce7eb5a
i r a gud pro gammer
2015-12-01 22:48:10 -08:00
Crazylemon
11562a8e03
Lets the ore reclaimer make plasma glass from plasma and glass
2015-12-01 22:19:54 -08:00
Fox McCloud
ca5362f055
Merge pull request #2687 from SvartaSvansen/more-char-setup
...
More character setup changes
2015-12-01 19:21:58 -05:00
ZomgPonies
900f20b9bd
I -think- this is what you guys mean?
2015-12-01 19:06:57 -05:00
Fox-McCloud
afeb0f30ce
Phlog Nerf/Balance
2015-12-01 00:32:42 -05:00
Tastyfish
f839b43bcc
Merge remote-tracking branch 'origin/inputfix' into inputfix
...
Conflicts:
code/_onclick/hud/screen_objects.dm
code/game/dna/genes/vg_powers.dm
code/modules/admin/verbs/adminhelp.dm
code/modules/economy/EFTPOS.dm
code/modules/mob/living/silicon/robot/life.dm
2015-11-30 22:44:55 -05:00
Tastyfish
280fc65938
added cancel to more powers, hand tele, cleanups to others
2015-11-30 22:30:57 -05:00
Tastyfish
897313844b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into inputfix
...
Conflicts:
code/modules/mob/living/silicon/robot/life.dm
2015-11-30 21:54:22 -05:00
Fox-McCloud
0bbd8ea8d2
Botany QoL Changes
2015-11-30 20:03:59 -05:00
TheDZD
aca9cf1650
Merge pull request #2694 from tigercat2000/fixes
...
Borg death fixes, human cleanup, carbon life tweaks
2015-11-30 19:46:54 -05:00
TheDZD
ff415212bf
Merge pull request #2686 from ZomgPonies/nations22
...
Nations 2.2 -- Bookkeeping Boogaloo
2015-11-30 19:22:04 -05:00
TheDZD
42845228bb
Merge pull request #2684 from Tastyfish/nanomaps
...
fixed nanoui maps positioning stuff wrong, atmos control having any alarms
2015-11-30 19:19:44 -05:00
ZomgPonies
c1a5f41680
Derp
2015-11-30 15:42:26 -05:00
ZomgPonies
5094a85160
Gives mechas speech bubbles.
2015-11-30 15:14:52 -05:00
Tigercat2000
b474b72ce5
Borg death fixes, human cleanup, carbon life tweaks
2015-11-30 07:16:35 -08:00
Aurorablade
2f28c537c4
Removes Null
2015-11-30 07:46:06 -05:00
Aurorablade
8b39fa3bb1
Fixes custom enemy communications
2015-11-30 01:25:12 -05:00
Tastyfish
b2abdd34c1
added input cancelling to pda msg, chemmaster ops, borg mod selection
2015-11-30 01:06:21 -05:00
Tastyfish
1627c6b124
made AI tracking cancel-able, fixed folder labelling
2015-11-30 01:06:21 -05:00
Tastyfish
e2f67a4260
fixed various inputs to be cancel-able
2015-11-30 01:06:20 -05:00
Tastyfish
e562d9d0c2
added input cancelling to pda msg, chemmaster ops, borg mod selection
2015-11-30 01:00:15 -05:00
ZomgPonies
6988ea6624
Missing brackets
2015-11-29 23:25:32 -05:00
ZomgPonies
a765d4587b
Add the ability to choose a heir and for heir to takeover
2015-11-29 19:52:31 -05:00
Tastyfish
57ae7e1c9a
made AI tracking cancel-able, fixed folder labelling
2015-11-29 19:40:23 -05:00
SvartaSvansen
528ad01873
The non-Vox are taking all the Vox socks!
2015-11-29 18:58:00 -05:00
