tigercat2000
f2bbdbada8
Merge pull request #9195 from Kyep/ts_egg_runtime_fix
...
Egg runtime fix
2018-07-11 11:15:56 -07:00
tigercat2000
47947102ff
Merge pull request #9154 from datlo/Ion
...
Make ion laws more specie inclusive
2018-07-11 11:14:52 -07:00
Fox McCloud
ef23639921
Merge pull request #8875 from Citinited/put-that-cookie-down
...
Adds random fortunes to fortune cookies
2018-07-11 13:55:28 -04:00
Kyep
1fb18b84c5
egg runtime fix
2018-07-11 02:02:22 -07:00
Crazy Lemon
3a2ec962a5
Merge pull request #9190 from Fox-McCloud/build-the-boop
...
Adds Buildable Integrated Robotic Chassis & Robotic Limb Surgery
2018-07-10 22:23:28 -07:00
Fox McCloud
a5b20d64b6
robotic brains
2018-07-11 00:49:16 -04:00
Fox McCloud
ff440d3437
name change
2018-07-09 23:20:48 -04:00
Fox McCloud
e4b0ec70ec
deserialize me cap'n
2018-07-09 18:12:36 -04:00
Fox McCloud
9463807ac2
done
2018-07-09 05:45:01 -04:00
Fox McCloud
6e9104650e
standardization
2018-07-09 04:44:36 -04:00
Fox McCloud
a3b5cf83e4
tweaks
2018-07-09 04:16:25 -04:00
Fox McCloud
078a22fb2c
Merge remote-tracking branch 'upstream/master' into purges-assisted-organs
2018-07-09 03:13:10 -04:00
Fox McCloud
f731150505
tweak
2018-07-09 03:08:53 -04:00
tigercat2000
30eaa5b860
Merge pull request #9179 from Fox-McCloud/vital-heads
...
Heads No Longer Vital (Brains Still Are)
2018-07-08 23:43:47 -07:00
Fox McCloud
7046c20f61
cybernetic eyes
2018-07-09 02:34:53 -04:00
Fox McCloud
70797c08c7
more round-start mechanical organs
2018-07-09 01:57:39 -04:00
Fox McCloud
87ff44acb6
Merge remote-tracking branch 'upstream/master' into purges-assisted-organs
2018-07-09 01:26:42 -04:00
Fox McCloud
5c077bf32a
Adds Buildable Automated Machine Frames and Robotic Limb Customization Surgery
2018-07-08 23:54:50 -04:00
Fox McCloud
3a230faaa6
grammar tweak
2018-07-08 20:03:00 -04:00
Fox McCloud
27ebe7a6fe
Standardized Robotic Organ Checking--Removes Mechassited Organs
2018-07-07 21:33:42 -04:00
Fox McCloud
62f39784e2
Cybernetic Organs
2018-07-07 19:48:04 -04:00
tigercat2000
8153313aa3
Merge pull request #9130 from Kyep/chatroom_be_gone
...
Removes PDA Chatrooms
2018-07-06 18:29:56 -07:00
Crazy Lemon
2a0733a008
Merge pull request #9151 from Fox-McCloud/pistol-change-loot
...
Stechkin Maintenance Pistol Change
2018-07-06 18:12:29 -07:00
tigercat2000
fcdb0fe54b
Merge pull request #9172 from Fox-McCloud/no-lances
...
Removes Explosive Lances
2018-07-06 15:01:07 -07:00
Fox McCloud
4dc9fc4362
Heads No Longer Vital (Brains Still Are)
2018-07-05 22:24:13 -04:00
Fox McCloud
319a6cd500
Removes Explosive Lances
2018-07-03 18:13:51 -04:00
Crazy Lemon
fc60131d5d
Merge pull request #9166 from alexkar598/this-will-burn-ais-down-to-the-ground
...
Ais can no longer be on fire
2018-07-03 12:47:38 -07:00
Crazy Lemon
bd7540a3f9
Merge pull request #9159 from MINIMAN10000/pod-eject
...
Restrained spacepod passenger can now exit pod after 2 minutes
2018-07-03 12:05:04 -07:00
alexkar598
c391e4d823
you want those true and false?
2018-07-02 15:37:14 -04:00
alexkar598
7fafde8102
Update ai.dm
2018-07-02 15:32:41 -04:00
alexkar598
dc47c9d62b
IT burnnnns
2018-07-02 14:40:03 -04:00
MINIMAN10000
17a4d52101
not do_after, not equal concious, warn pilot if there is one
2018-07-02 11:09:35 -07:00
MINIMAN10000
288c16df1b
Restrained spacepod passanger can now exit pod after 2 minutes
2018-07-02 00:38:06 -07:00
Fox McCloud
9eefe326c8
Merge pull request #9140 from Crazylemon64/mmi_radio_upgrade
...
MMI radio upgrade
2018-07-01 22:19:18 -04:00
tigercat2000
76aefc59df
Merge pull request #8963 from FalseIncarnate/fluff
...
E.L.O. Fluff 2
2018-07-01 15:04:39 -07:00
datlo
79643cb587
Make ion laws more specie inclusive
...
Replaced instances of "Human" in ion laws by "Crew" to be more
compatible with the default Crewsimov and Corporate lawsets.
2018-07-01 12:16:26 +02:00
Crazy Lemon
3ca333d666
Merge pull request #9040 from Anasari/CryoLog
...
Cryo Logging PR
2018-07-01 00:47:39 -07:00
FalseIncarnate
5823b354df
merge conflicts
2018-07-01 02:42:31 -04:00
Crazy Lemon
3975a7d0f7
Merge pull request #8999 from Citinited/somebody-toucha-ma-spaghett
...
Adds macaroni cheese (pizza)
2018-06-30 22:11:05 -07:00
Crazy Lemon
bdaa1813a2
Merge pull request #9149 from datlo/master
...
Clown Magboots
2018-06-30 22:08:29 -07:00
Crazy Lemon
f1fc9375f5
Merge branch 'master' into LabelerLogging
2018-06-30 20:19:53 -07:00
Fox McCloud
6c9f83f685
Stechkin Maintenance Pistol Change
2018-06-30 19:24:56 -04:00
Crazy Lemon
7d61c7f32d
Merge pull request #9047 from Citinited/conveyor-belt-placer
...
Adds the conveyor belt placer
2018-06-29 21:11:49 -07:00
datlo
69779717fa
Cut code duplication, added sprites
...
Added a new variable to magboots called slowdown_passive, letting you
set how much the magboots slow you down when not activated, by default
SHOES_SLOWDOWN (same behaviour as before). Clown magboots use
SHOES_SLOWDOWN+1, same speed as clown shoes.
Removed redefinition of toggle as the magboots can now use the original
toggle properly.
Removed var/footstep which was copy pasted from the original clown
shoes, as far as I can tell it is not used or checked anywhere and
removing it does not silence squeeks or change any other behaviour.
Added sprites for the item icon and the mob's shoes when activated and
deactivated (adds a little red light that can be seen by a keen eye when
the shoes are activated)
2018-06-29 20:22:22 +02:00
datlo
8a909e4da5
Clown Magboots V2
...
changed syndi description and fixed my accidental reverts sorry for the
commit spam I still stuck at github
2018-06-28 12:10:22 +02:00
datlo
0100f679b0
Revert "Clown Magboots V1"
...
This reverts commit 38d0c3652c
2018-06-28 12:03:11 +02:00
datlo
38d0c3652c
Clown Magboots V1
...
Item created, added to uplink
2018-06-27 23:39:17 +02:00
Fox McCloud
bfac50ef12
Merge pull request #9114 from MINIMAN10000/Fix-Emitters
...
Fix emitters
2018-06-26 22:29:55 -04:00
Citinited
e73ce56370
crazylemon tweaks
2018-06-26 22:18:27 +01:00
Anasari
5a09245029
Change to attack logs. Use ATKLOG_ALL
2018-06-26 16:47:09 +08:00
