cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 02:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,274 Commits 26 Branches 2 Tags
c09fcb6e14d95cc4b2c2c00a42e7c3d73ccf4b4b
Commit Graph

19679 Commits

Author SHA1 Message Date
Fox-McCloud
c09fcb6e14 Pshhhooooommmmm 2016-01-06 15:40:04 -05:00
Fox-McCloud
f641cc2710 balance 2016-01-06 03:40:36 -05:00
Fox-McCloud
ebdd9d3897 Timestop Spell Port and Sepia Slimes 2016-01-06 03:30:08 -05:00
Tigercat2000
986c687d27 Merge remote-tracking branch 'upstream/master' into lighttiles 
Conflicts:
	code/game/objects/items/stacks/tiles/tile_types.dm
 2016-01-05 18:49:36 -08:00
Tigercat2000
a10d7d1bd2 fix lightfloors 2016-01-05 18:46:39 -08:00
TheDZD
3d316d9c66 Merge pull request #3116 from Fox-McCloud/slipping-floors 
Slippery Refactor and Floors
 2016-01-05 21:42:26 -05:00
TheDZD
34901c8664 Merge pull request #3125 from Fox-McCloud/typo-fixes 
Fixes a Few Vulp Typo's
 2016-01-05 20:20:37 -05:00
Fox-McCloud
44fe321366 cleaner 2016-01-05 20:14:10 -05:00
Fox-McCloud
9478fc078c Fixes a Few Vulp Typo's 2016-01-05 19:39:19 -05:00
TheDZD
ebdbe4627b Merge pull request #3114 from Fox-McCloud/chem-master 
Constructable Chem Master
 2016-01-05 19:36:11 -05:00
TheDZD
73f6114b1f Merge pull request #3112 from Fox-McCloud/object-verb-restore 
Restores a Few Object Verbs
 2016-01-05 19:35:55 -05:00
TheDZD
750d555ff0 Merge pull request #3107 from Fox-McCloud/vox-tails-vulp-markings 
Vox Tail and Vulp Markings
 2016-01-05 19:35:34 -05:00
TheDZD
4dd3cd76bf Merge pull request #3085 from Fox-McCloud/sec-rifle 
Sec Rifle Port
 2016-01-05 19:34:33 -05:00
Fox McCloud
67f704d235 Merge pull request #3119 from Crazylemon64/simple_animals_sleeping 
Simple animals will now tick down sleeping
 2016-01-05 02:37:37 -05:00
Fox-McCloud
38ee27898b structuring 2016-01-05 01:34:16 -05:00
Crazylemon64
3a3f0f56c4 Simple_animals now tick down sleeping, so relogging doesn't cause deaf 2016-01-04 21:48:03 -08:00
Fox McCloud
d9520c4327 Merge pull request #3105 from Crazylemon64/guess-we-didn't-need-it 
Removes that conversion proc we didn't actually use
 2016-01-05 00:46:12 -05:00
Crazylemon64
2f642e6d75 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into simple_animals_sleeping 2016-01-04 21:44:27 -08:00
Fox-McCloud
447be6f9fd binsult.ogg 2016-01-05 00:41:46 -05:00
Fox McCloud
1842b708cb Merge pull request #3118 from Aurorablade/ValidCloning 
Fixes antag huds showing after cloneing for solo antags
 2016-01-05 00:28:42 -05:00
Aurorablade
3bfb86a2f1 Boop 2016-01-05 00:23:08 -05:00
Aurorablade
b2d2de16f4 antaf huds should no long be shown after clowning 
i made typos in that commit message..it amuses me too much to fix.
 2016-01-05 00:14:11 -05:00
TheDZD
068a42b8f1 Merge pull request #3108 from Fox-McCloud/shock-fix 
Fixes Shock Explosion Oversight
 2016-01-04 22:03:14 -05:00
Fox-McCloud
550aef34ba less copy-paste 2016-01-04 21:54:47 -05:00
Fox-McCloud
4221d033ab Slipping Refactor and Floors 2016-01-04 21:22:59 -05:00
Fox-McCloud
51851e9ec5 Constructible Chem Master 2016-01-04 18:23:41 -05:00
Fox McCloud
bd606ede4f Merge pull request #3111 from Crazylemon64/welding_tool_fuel_check 
Fixes a flipped conditional that made welders unreadable
 2016-01-04 18:11:01 -05:00
Fox-McCloud
b69eb0a408 better checks and fingerprints 2016-01-04 16:53:35 -05:00
Crazylemon
df224e81d6 Simple animals will now tick down sleeping 2016-01-04 13:47:36 -08:00
Fox-McCloud
a7d1bcce4e Restores a Few Object Verbs 2016-01-04 16:42:53 -05:00
Crazylemon
b06d542d50 Fixes a flipped conditional that made welders unreadable 2016-01-04 10:10:50 -08:00
Crazylemon
855b2f7f61 Summoned guardians will vanish without a master 2016-01-04 07:01:36 -08:00
Fox-McCloud
1f16068970 Fixes Shock Explosion Oversight 2016-01-04 07:46:45 -05:00
Fox-McCloud
59a3a5281e Vox Tail and Vulp Markings 2016-01-04 02:10:47 -05:00
Crazylemon
01fd2e0f7b Removes that conversion proc we didn't actually use 2016-01-03 21:43:59 -08:00
FalseIncarnate
a358291d83 EMERGENCY PASTE REMOVAL 
Copy-paste struck again!
 2016-01-04 00:00:50 -05:00
Fox-McCloud
44d46bc456 map fix 2016-01-03 22:42:59 -05:00
Fox-McCloud
38149bfc7d Merge remote-tracking branch 'upstream/master' into sec-rifle 2016-01-03 22:35:28 -05:00
Fox McCloud
103372e92b Merge pull request #3037 from KasparoVy/master 
Adds Body Marking Customization, Head Accessories, Revises Unathi Customization, Related Minor Fixes, etc.
 2016-01-03 22:33:40 -05:00
TheDZD
6b9fd8485c Merge pull request #3103 from Fox-McCloud/fixes-shield-generator-boards 
Fixes Shield Generator Circuits
 2016-01-03 22:31:04 -05:00
Fox McCloud
9c863e5259 Merge pull request #3092 from tigercat2000/tgsmooth 
-tg- Smoothing/Floor refactor
 2016-01-03 22:28:50 -05:00
Tigercat2000
31aab5452b -tg- smoothing/floor refactor 
Squashed:

Add plasteel goonplaque turf

Builtin_tile nulling

Levelupdate()

Fix falsewalls, update smoothing.dmm

fixes rwall decon
 2016-01-03 19:24:13 -08:00
Fox McCloud
955eae12ff Merge pull request #3100 from RudiPardieck/AtmosMonitorBugfix 
Bugfix for atmos monitor
 2016-01-03 21:47:01 -05:00
Fox-McCloud
a3a03a67f9 derp 2016-01-03 21:38:43 -05:00
TheDZD
6ec065b319 Merge pull request #3102 from Fox-McCloud/ert-fix 
ERT Medical Belt Fix
 2016-01-03 21:38:15 -05:00
Fox-McCloud
880efed300 Fixes Shield Generator Circuits 2016-01-03 21:36:27 -05:00
Fox-McCloud
dfa55f1f35 ERT Medical Belt Fix 2016-01-03 21:23:49 -05:00
Fox-McCloud
e9d5c67371 securer crates 2016-01-03 21:02:48 -05:00
Fox-McCloud
97527dddc6 tweak 2016-01-03 20:34:40 -05:00
TheDZD
a1a0daaf2e Merge pull request #3096 from Fox-McCloud/fast-transfer 
Fixes Fast Crew Transfers
 2016-01-03 20:03:37 -05:00