FalseIncarnate
f6de415d36
Food icon reorganization
...
Moved around some food icons, to reduce clutter in the food.dmi file
Notable moves:
- All custom food icons are now in a new file custom.dmi
- All pizza icons (food and boxes) are now in a new file pizza.dmi
- All pasta food icons are now in a new file pasta.dmi
Also removed some duplicate icons, renamed some custom food icons for
better clarity, adjusted existing code to point to new icon locations
2018-07-15 20:46:24 -04:00
FalseIncarnate
5bf6961f64
Food item reorganization
...
Reorganized food defines into more manageable files.
Fixed some horrendous formatting in pizza box code
Removed a duplicate definition of the poppy pretzel food item
Standardized some capitalization on various food names.
No in-game changes, purely code shuffling.
2018-07-15 19:01:44 -04:00
Crazy Lemon
8c27afad9a
Merge pull request #9060 from Aurorablade/SpaceKoi
...
Space Koi Event
2018-07-13 23:04:52 -07:00
Crazy Lemon
1fd83585d3
Merge pull request #9204 from Fox-McCloud/robotic-brain-rebrand
...
Robotic brain rebrand
2018-07-13 21:41:31 -07:00
Fox McCloud
25b53a8a6e
eh
2018-07-13 18:17:42 -04:00
Fox McCloud
5f31b03972
splitting
2018-07-13 18:09:16 -04:00
Fox McCloud
3c8d94a7c6
preventing installation of robotic brain in organic chest
2018-07-12 20:15:08 -04:00
Fox McCloud
67d12c0aa6
Full Positronic Brain to Robotic Brain Refactor
2018-07-12 19:30:48 -04:00
Fox McCloud
fd3e0e950f
Fixes Ridiculous Surgical Infections
2018-07-12 17:14:16 -04:00
Crazy Lemon
c9fb3a22f7
Merge pull request #9165 from alexkar598/nerfs-the-pods
...
Pods are no longer miniguns
2018-07-11 13:56:55 -07:00
Crazy Lemon
25d0bce893
Merge pull request #8307 from Allfd/supermatter
...
Update SM
2018-07-11 12:37:20 -07:00
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
Aurorablade
9422d3a846
Suggested changes
2018-07-04 00:12:54 -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
ba9646fa16
Update equipment.dm
2018-07-03 05:30:40 -04:00
Aurorablade
edbac20f4a
maybe dis?
2018-07-02 17:03:02 -04: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
alexkar598
05674ccc00
Update equipment.dm
2018-07-02 07:28:30 -04:00
alexkar598
5ae7032120
Update equipment.dm
2018-07-02 07:22:43 -04: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
