cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 06:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,327 Commits 7 Branches 0 Tags
b27dbdaaf5d3d3d1bb93bb06ddab20bb604b4fb1
Commit Graph

880 Commits

Author SHA1 Message Date
StarSmasher
b27dbdaaf5 I'm too broken for this 
Also fixes this one, probably.
 2015-05-05 14:21:28 +02:00
StarSmasher
1c9dbfdb2b Removes unneeded variable 
All good now.
 2015-05-05 14:13:26 +02:00
StarSmasher
89b65e216f Applies Icon Caching to battery racks 
In my tests a while ago, I found that the battery racks came quite high in the profiler. So I decided to see if I could alleviate some of that trouble.

Very simple, caches the icons based off of previous work done on the APC, requires less processing for the icon updates.
Function has been tested and has been used on a live server for a few weeks prior to said server's shutdown.
Will make a 2nd PR following another like this except for HUD icons.
 2015-05-05 13:12:52 +02:00
Chinsky
3d7bfd8aff Merge pull request #9007 from PsiOmegaDelta/Initialize 
Removes the need for spawn() in New() procs.
 2015-04-30 21:12:06 +03:00
PsiOmega
fcfdcecd3a initialize() should now always be called, be it on game starting up or object being created after game start. 
Partially fixes #9036.
 2015-04-30 19:28:35 +02:00
PsiOmega
f760d44127 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm
 2015-04-28 08:43:31 +02:00
Chinsky
afa82e5d83 Merge pull request #9003 from mwerezak/dev-fixes 
Fixes
 2015-04-28 06:26:22 +03:00
mwerezak
36d9944dfd Fixes #8977 2015-04-27 14:55:18 -04:00
mwerezak
290a7d5000 Fixes #8536 
Also removes a bunch of redundant comments
 2015-04-27 01:11:40 -04:00
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +02:00
PsiOmega
e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
mwerezak
5b037670b3 Removes most instances of item_color 
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
 2015-04-22 17:40:27 -04:00
Zuhayr
0b03a389df Merge pull request #8910 from Baystation12/master 
Master into dev
 2015-04-19 17:26:04 +09:30
PsiOmega
0e0d13f1b1 Fixes #8490. 
Now properly calls update icon on EMP effect changes.
 2015-04-18 12:01:32 +02:00
PsiOmega
858b56a2e5 The Nar-Sie summoning ritual is now animated. 2015-04-17 08:04:59 +02:00
PsiOmega
1daf0abe3d Switches around turf/datum garbage handling (my fault..). Adds null check for zone rebuilds. 2015-04-16 14:23:19 +02:00
PsiOmega
d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +02:00
PsiOmega
516b60962e Merge remote-tracking branch 'upstream/dev' into CultPorting 2015-04-14 15:54:22 +02:00
Zuhayr
7129feb417 Removed some cocked up files. 2015-04-13 22:58:32 +09:30
PsiOmega
1511e2b3f4 Ports /vg/'s Nas-Sie remake. 
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
 2015-04-12 16:19:16 +02:00
Chinsky
be3f372680 Merge pull request #8788 from PsiOmegaDelta/PortedSpells 
Ports /vg/'s spell system for use by the cult port.
 2015-04-11 02:05:58 +03:00
PsiOmega
1ba8dcbca9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/vending.dm
 2015-04-10 15:25:34 +02:00
PsiOmega
990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
GinjaNinja32
a377806b47 Fixes PACMAN UI initial data 
Fixes #8561
 2015-04-09 15:58:07 +01:00
mwerezak
398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix 
Conflicts:
	code/modules/organs/organ_external.dm
 2015-03-31 02:13:22 -04:00
mwerezak
9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix 
Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
 2015-03-31 01:37:55 -04:00
mwerezak
cdfce64ad0 Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate. 2015-03-30 22:05:00 -04:00
=
601e6fb7ef Merged with dev. 2015-03-31 11:17:13 +10:30
mwerezak
1b4e13aabc Removes unnecessary and cruft procs from mob/inventory.dm 2015-03-30 05:28:09 -04:00
=
d77010221c Merge with dev. 2015-03-30 08:36:52 +10:30
PsiOmega
1a000b0e0f Merge remote-tracking branch 'upstream/dev' into NarsiePort 
Conflicts:
	code/modules/mob/living/carbon/human/say.dm
 2015-03-29 13:04:53 +02:00
PsiOmega
464d702d4b Mob refactoring. 
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
 2015-03-29 10:44:31 +02:00
Zuhayr
c0887333bc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-03-27 11:13:53 +10:30
Zuhayr
aa6439096c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 23:25:26 +10:30
Zuhayr
dda3fc8f02 Merge pull request #8469 from mwerezak/robot-emp 
Reduces the effect of EMP on robot power cells, some other things
 2015-03-26 19:00:39 +10:30
Zuhayr
97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
Zuhayr
d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
Zuhayr
3fe4162719 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-25 00:29:59 +10:30
PsiOmegaDelta
89965420bb Merge pull request #8603 from Baystation12/dev-freeze 
Dev freeze
 2015-03-24 14:00:57 +01:00
Zuhayr
b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
Zuhayr
45f28d5372 Fixes #8485 2015-03-24 13:20:24 +10:30
mwerezak
f8eb5ccb97 indent fix 2015-03-23 13:04:39 -04:00
mwerezak
28df26b36c Reduces the effect of EMP on robot power cells 
Temporary fix to resolve #8454
 2015-03-23 02:34:17 -04:00
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
Loganbacca
11d340f898 Projectile effects - Part 3 
- Fixes for turrets, rogue drones, and emitters
- Removed muzzle flash from chem darts
- Converted emitters to use spanclasses and have correct capitalization
 2015-03-09 22:17:34 +13:00
Zuhayr
c9a2ed84fe Merge pull request #8352 from PsiOmegaDelta/LessEdits 
Mappings.
 2015-03-05 09:20:03 +10:30
Neerti
f229aa479f Adds a bunch of prettiness to the TEG, fixes a runtime. 2015-03-04 09:13:05 -05:00