cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,412 Commits 26 Branches 2 Tags
bbe8b754a754eba16bd06db5fcc9c8d50fe5eb5f
Commit Graph

17681 Commits

Author SHA1 Message Date
Crazylemon64
bbe8b754a7 Undoes the hand change 2018-07-24 20:58:39 -07:00
Crazylemon64
b2d0bb1c0b Fixes maploading so that the cyberiad and space hotel load cleanly again 2018-07-24 20:58:38 -07:00
Crazy Lemon
c93a3d0f5b Merge pull request #9242 from Fox-McCloud/tentative-fix 
Species Refactor Fixes
 2018-07-23 17:12:10 -07:00
Fox McCloud
ebe0b82bb0 Species Refactor Fixes 2018-07-23 01:28:58 -04:00
Crazy Lemon
e48ab63bcc Merge pull request #9218 from Fox-McCloud/beesplosion 
Adds Beesplosion Chemical Reaction
 2018-07-21 21:11:33 -07:00
Fox McCloud
72309e4694 protection 2018-07-21 23:17:48 -04:00
FalseIncarnate
26eb849509 merge conflict 2018-07-21 20:26:31 -04:00
Fox McCloud
e2fcfd9254 species override and IPC monitor fix 2018-07-21 03:53:06 -04:00
Fox McCloud
5b3051cad9 icon generation fixes 2018-07-20 17:49:29 -04:00
Fox McCloud
19d24a0bb0 IPC emote fix 2018-07-20 16:14:16 -04:00
Fox McCloud
ea1cd08bb5 fixes nitrogen warning 2018-07-20 02:52:58 -04:00
Fox McCloud
81133f7bb5 and another minor one 2018-07-20 01:24:43 -04:00
Fox McCloud
dea0b0156a minor fix 2018-07-20 01:05:47 -04:00
Fox McCloud
8664e5501b addresses changes 2018-07-19 15:32:03 -04:00
Fox McCloud
62daecbf1e minor cleanup 2018-07-19 05:15:58 -04:00
Fox McCloud
648049def0 better runtime fix 2018-07-19 04:08:43 -04:00
Fox McCloud
59d0e53754 fixes vox no DNA head runtime 2018-07-19 03:51:42 -04:00
Fox McCloud
6092e0319f name and further fixes 2018-07-19 02:04:03 -04:00
Fox McCloud
c6400382f6 last thing 2018-07-18 22:37:53 -04:00
Fox McCloud
702f093c64 finishing touches 2018-07-18 22:14:44 -04:00
Fox McCloud
c6bb2ecd4d abductor stuff 2018-07-18 19:51:22 -04:00
Fox McCloud
7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud
d512b362ed keep equipped items on species change 2018-07-17 20:27:47 -04:00
Fox McCloud
0a613a8f42 fixes 2018-07-17 18:18:16 -04:00
Fox McCloud
f075ef7836 wow, it works 2018-07-17 06:05:06 -04:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Fox McCloud
9c3fcaa53c AGHHHHHHHHHHHHH 2018-07-17 02:13:52 -04:00
Fox McCloud
bf8dd30a2a Adds Beesplosion Chemical Reaction 2018-07-16 22:16:57 -04:00
Crazy Lemon
384fe93d33 Merge pull request #8975 from Citinited/rpd-refactor 
RPD refactor
 2018-07-16 14:22:38 -07:00
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
Citinited
29c6e6d69b A bunch of refactoring; RPD runtimes if a forbidden pipe is attempted to be dispensed; names loose disposals pipes 2018-07-16 00:23:03 +01: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
Fox McCloud
b2c8f051b1 Merge remote-tracking branch 'upstream/master' into camera-damage-refactor 2018-07-15 16:31:50 -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