cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
1569 Commits
Author SHA1 Message Date
Fox-McCloud 3bed31e08c Chemistry Cleanup and Fixes 2015-03-01 16:34:23 -05:00
FalseIncarnate 85366b8307 Xenoarchaeology Find icon fix 
Fixes the icons for the energy guns found through Xenoarchaeology to
actually use icons that exist.
 2015-03-01 01:30:21 -05:00
ZomgPonies 43783ca583 Merge pull request #452 from Fox-McCloud/RND-Fixes-Balance 
RnD Fixes and Tweaks
 2015-02-28 22:16:37 -05:00
Fox-McCloud 923ba5932f RnD Fixes and Tweaks 2015-02-27 17:36:20 -05:00
Fox-McCloud 30465b03d6 Telescopic Riot Shield 2015-02-27 07:31:03 -05:00
Fox-McCloud 9850e6deb2 Laser Additions and Taser Nerf 2015-02-25 23:34:42 -05:00
Markolie 004b365110 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/modules/reagents/reagent_containers/syringes.dm
 2015-02-22 22:15:45 +01: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
Fox-McCloud bea78f2432 Chemistry Tweaks 2015-02-22 15:05:15 -05: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
Markolie efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05: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
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 d0d6c8eebd Merge with upstream/master 
Fixes merge conflicts.
 2015-02-19 19:38:48 -05:00
ZomgPonies 043a5e0e31 Merge pull request #331 from Markolie/master 
Saycode/language/species port from Bay
 2015-02-19 19:07:25 -05:00
Markolie 46c53be6f1 Part 2 of saycode/language/species port from Bay. Also includes bugfixes. 2015-02-20 00:50:28 +01:00
DZD 4bcdb94a99 Merge with upstream/master 
Fixes conflicts
 2015-02-18 13:41:32 -05:00
Mark van Alphen 87ed05c146 Merge pull request #326 from Artorp/AutolatheQueue 
Added queue functionality to the autolathe
 2015-02-18 16:16:05 +01:00
Mark van Alphen b407810e07 Merge pull request #324 from ZomgPonies/rev 
New +MENTOR permission for mentors
 2015-02-18 16:15:44 +01:00
ZomgPonies 6558590cb3 Fixed MAX SCIENCE moved admin verbs around 2015-02-18 09:21:31 -05:00
ZomgPonies 97f80d0f5b Merge pull request #323 from Fox-McCloud/Sounds 
Sounds
 2015-02-17 18:44:54 -05:00
Artorp e1eb2b9a1d Updated m_amt and g_amt to match their design 2015-02-17 18:52:31 +01:00
Fox-McCloud a03879d83f Sound Updates 2015-02-16 16:29:43 -05:00
Markolie 8726bad5b0 Z-level check refactor 2015-02-16 20:33:28 +01:00
Markolie 734893ffa1 Add design for handheld crew monitor 2015-02-16 19:21:49 +01:00
Markolie 9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
Markolie 5fdabeda13 Minor R&D search function fix 2015-02-13 23:28:09 +01:00
Markolie 0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
DZD b3a0c9a975 Removes TABLEPASS and FPRINT flags 
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
 2015-02-10 17:41:37 -05:00
Markolie 354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/machinery/rechargestation.dm
 2015-02-09 16:15:00 +01:00
Markolie 7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie d10451c567 Fix a bunch of runtimes 2015-02-09 04:03:20 +01:00
Markolie 2734a1bcf6 Search function for research 2015-02-08 14:35:49 +01:00
Fox-McCloud af78338a99 Nerfborgs 2015-02-08 00:22:13 -05:00
Fox-McCloud 8667786655 Crossbow Rework 2015-02-03 23:35:09 -05:00
Markolie afac549c39 Revert economy changes, quarantine law fix 2015-02-02 20:02:29 +01:00
Markolie 2a1e9931a6 Add shuttle stranding 2015-02-01 16:05:43 +01:00
Markolie 56cd293f4b Unused/WorkInProgress folder cleanup 2015-01-31 16:40:29 +01:00
Artorp c281329be0 fix: retractor autolathe build path 
Autolathes can now successfully print a retractor.
 2015-01-29 08:40:20 +01:00
Fox-McCloud eaa54e35a7 Vox Hardsuits and Spacesuits 2015-01-26 18:04:22 -05:00
Markolie e59a94a8a1 Constructable newscaster, labor camp overhaul, other fixes 2015-01-16 21:50:33 +01:00
Markolie ebfe5eea92 R&D fix 2015-01-14 06:19:01 +01:00
Markolie 6a0d3a60b7 Changeling DNA fixes 2015-01-13 20:17:00 +01:00
Markolie c65c9c8a7a Minor R&D changes, defib/IPC fix attempt 999 2015-01-09 05:37:21 +01:00
Markolie 2e37a88639 More verb fixes 2015-01-06 22:46:11 +01:00
Markolie 92b57b5189 Bug fixes, R&D design files, map fixes 2015-01-05 21:03:48 +01:00
Fox-McCloud 43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Markolie f55db398cf ID fix 2014-12-24 00:53:25 +01:00