cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-07 05:03:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 9 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

4021 Commits

Author SHA1 Message Date
Markolie da05274bf4 Mapfix, hivemind fix 2015-02-25 01:13:53 +01:00
ZomgPonies 80b83105fe Merge pull request #399 from Fox-McCloud/flip 
*flip
 2015-02-24 18:35:23 -05:00
ZomgPonies 367c8ba519 Merge pull request #411 from Markolie/master 
Bug fixes
 2015-02-24 14:29:14 -05:00
Markolie b44255d250 Bug fixes 2015-02-24 18:57:12 +01:00
ZomgPonies 859c907962 Merge pull request #396 from Markolie/master 
Bug fixes, bot process update
 2015-02-24 08:01:25 -05:00
Markolie 3f51486ba4 Bug fixes, bot proces controller update 2015-02-24 01:40:43 +01:00
Fox-McCloud 4b127dfadd *flip 2015-02-23 18:49:48 -05:00
Fox-McCloud 6fba118892 Merge remote-tracking branch 'upstream/master' into Fixes 2015-02-23 16:47:55 -05:00
Fox-McCloud 96a941ba19 Fixes and Guns 2015-02-22 16:32:35 -05:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie aee4626ed9 Slow down milking Betsy 2015-02-22 21:31:28 +01:00
Markolie 377dfe894d Add attack animations 2015-02-22 21:15:54 +01:00
Markolie 0048394e3c Fix pAI universal translator toggle 2015-02-22 19:30:45 +01:00
Markolie 72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
 2015-02-22 19:12:11 +01:00
Markolie 982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Markolie 3b072b5a62 Remove click delay from most things 2015-02-22 18:47:58 +01:00
ZomgPonies 1f5ef8d4dd Merge pull request #380 from Markolie/master 
Adds celsius to the freezer/heater, crafting update
 2015-02-22 08:30:11 -05:00
ZomgPonies 1c1ebc3f3f Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits 
Syndi hardsuits
 2015-02-22 08:27:38 -05:00
ZomgPonies bb620841a1 Merge pull request #375 from Fox-McCloud/Thickmaterial 
Thickmaterial
 2015-02-22 08:26:02 -05:00
Fox-McCloud 232eaaac72 Revert "Revert "Tail Wagging System"" 
This reverts commit eb4f2af194.
 2015-02-22 04:41:02 -05:00
Fox-McCloud 10c06a71a2 Revert "Revert "Death Wagging"" 
This reverts commit 1c32a43506.
 2015-02-22 04:40:34 -05:00
Markolie 886bf7400b Final crafting fixes 2015-02-22 02:24:53 +01:00
ZomgPonies c91558b095 Merge pull request #379 from Markolie/master 
Bug fixes
 2015-02-21 15:02:56 -05:00
Markolie d2dcb7a041 Fix AI tracking, atmospherics construction, blob talk fix, ERT radio fix 2015-02-21 20:56:55 +01:00
ZomgPonies 660ce3454b COMIC mutation bugfix 2015-02-21 13:25:09 -05:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
Mark van Alphen d126a98527 Merge pull request #371 from TheDZD/changeling 
Changeling Bugfixes
 2015-02-21 02:32:26 +01:00
ZomgPonies dd79cb9ef2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-20 19:26:30 -05:00
ZomgPonies 5ac15e63f2 Merge pull request #348 from Fox-McCloud/Tail-Wagging 
Tail Wagging System
 2015-02-20 19:19:15 -05:00
DZD 5e977cbfc9 Merge remote-tracking branch 'upstream/master' into changeling 2015-02-20 19:05:25 -05:00
ZomgPonies 8734b03ca3 Merge branch 'drones' of https://github.com/ZomgPonies/NewParadise into ZomgPonies-drones 
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
 2015-02-20 18:54:18 -05:00
Markolie 9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
Markolie f17c266919 Fix lobby chatter 2015-02-20 21:13:51 +01:00
Markolie 8e265002db Ensure silicons have galactic common 2015-02-20 21:07:44 +01:00
ZomgPonies 6bac3781d0 Fixed handcuffs, legcuffs and others 2015-02-20 19:56:57 +01:00
ZomgPonies 2c6d2f07fc Fix PDA bug 2015-02-20 19:56:57 +01:00
Markolie c89e3ac1eb Revert "Revert "Emergency communications hotfix"" 
This reverts commit 3ea36839a8.
 2015-02-20 17:59:07 +01:00
Markolie d8d1670b68 Revert "Revert "Saycode/language/species port from Bay"" 
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-02-20 17:46:35 +01:00
Fox-McCloud eb4f2af194 Revert "Tail Wagging System" 
This reverts commit 70a231f2dc.
 2015-02-20 03:32:00 -05:00
Fox-McCloud 1c32a43506 Revert "Death Wagging" 
This reverts commit bbb4900197.
 2015-02-20 03:30:36 -05:00
Fox-McCloud be2e754706 Syndicate Rebalance 2015-02-20 03:14:12 -05:00
Tigercat2000 826ccaed70 Extra Freeze features- Prevent direct touching and pulling 2015-02-20 05:16:03 +01:00
Fox-McCloud bbb4900197 Death Wagging 2015-02-19 21:49:45 -05:00
DZD 2e848c2c37 Merge remote-tracking branch 'upstream/master' into changeling 2015-02-19 20:59:41 -05:00
DZD 212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
DZD 5cad457f94 Span class fix 2015-02-19 20:01:23 -05:00
Fox-McCloud 70a231f2dc Tail Wagging System 2015-02-19 19:41:40 -05:00
DZD d0d6c8eebd Merge with upstream/master 
Fixes merge conflicts.
 2015-02-19 19:38:48 -05:00
DZD c11bb0d283 Fixes bugs 
- Tables can't have NODROP or ABSTRACT items placed on them anymore,
same for lockers and crates.
- Fixes a runtime with trying to strip a NODROP or ABSTRACT item.
 2015-02-19 19:32:58 -05:00