cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,471 Commits 5 Branches 0 Tags
f76a1d2024c00b7307b5458cae7f1e407f1be0b4
Commit Graph

24471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zuhayr
f76a1d2024 Removed custom item defines, refactored mech kits. 2015-05-12 15:49:56 +09:30
Zuhayr
59af7e5c4d Refactor/rewrite of custom item spawning. 2015-05-12 15:14:51 +09:30
Miniature
ed60b17f8d Cherrypicking Mini's custom item code. 2015-05-12 11:02:34 +09:30
Zuhayr
4cf296a6c9 First pass on custom item cleanup/refactor. 2015-05-12 10:53:16 +09:30
Zuhayr
dcdc0a4862 Merge pull request #9173 from Dennok/BuildModeIcon 
Build mode icon
 2015-05-11 18:22:06 +09:30
PsiOmegaDelta
5ef002b751 Merge pull request #9189 from PsiOmegaDelta/dev 
Dev
 2015-05-11 09:36:56 +02:00
PsiOmega
23cb5cdc20 Changelog update. 2015-05-11 09:30:58 +02:00
PsiOmega
d14904e1d6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm
 2015-05-11 09:28:59 +02:00
PsiOmegaDelta
2be2be05a2 Merge pull request #9188 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-05-11 09:26:44 +02:00
PsiOmega
30657de9a3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-05-11 09:21:22 +02:00
Chinsky
dcf4dea1ef Merge pull request #9187 from PsiOmegaDelta/Shower 
Fixes #9183
 2015-05-11 10:16:49 +03:00
PsiOmega
d1eae14343 Fixes #9183 
Very critical. No lewdness allowed.
 2015-05-11 09:08:27 +02:00
PsiOmegaDelta
f8e01fd564 Merge pull request #9185 from Zuhayr/dev 
Added construction drone sprites from Pawn.
 2015-05-11 08:26:44 +02:00
Chinsky
287a3805fd Merge pull request #9184 from mwerezak/vines2 
Tweaks space vines
 2015-05-11 09:16:03 +03:00
Zuhayr
6f41625752 Added construction drone sprites from Pawn. 2015-05-11 14:46:47 +09:30
Ccomp5950
59eaad3591 Merge pull request #9172 from PsiOmegaDelta/ProbabilitySheet 
Updates the event probability sheet with the new events.
 2015-05-11 00:41:25 -04:00
mwerezak
d39fc76113 Tweaks space vines 
Vines no longer mature nearly immediately, entangle less frequently.
Fixes vines entangling from adjacent turfs, which made it hard to tell
which vine was entangling someone.
 2015-05-10 23:23:25 -04:00
Zuhayr
55b3b9d151 Merge pull request #9174 from PsiOmegaDelta/ImplantLogs 
Corrects implanter attack log.
 2015-05-11 11:44:25 +09:30
Zuhayr
2adc8df1fa Merge pull request #8903 from Mloc/lightwrite 
Lighting rewrite
 2015-05-11 09:26:04 +09:30
Chinsky
ea28e4aadf Merge pull request #9126 from Techhead0/magbootsOverShoesTwo 
Magboots can be worn over shoes
 2015-05-11 02:48:45 +03:00
Mloc
79a191a2b5 dynamic fire colours 
Fire colour + light colour changes with temperature.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:29 +01:00
Mloc
7780287d3a mood lighting for computers 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:29 +01:00
Mloc
e6d43c7690 changelog for lighting rewrite 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:29 +01:00
Mloc
16d50c645d new object-based lighting system 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:25 +01:00
Dennok
c1059a9f3b New buildmode icons by BartNixon 2015-05-10 22:22:23 +03:00
Mloc
733c6a4fb5 simulated var for atoms, used to filter explosions and other actions 
kind of a stronger anchored var, used by lighting overlays

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:30 +01:00
Mloc
895e78df1e more lightweight camera caching 
no loops

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:30 +01:00
Mloc
5b92057890 lights in areas that don't require power will now automatically turn on 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:29 +01:00
Mloc
e602a7e286 remove the sub-area system 
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:29 +01:00
Mloc
18209f9d78 lighting map changes 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:29 +01:00
Chinsky
6669e9631e Merge pull request #9176 from StarSmasher44/patch-1 
Optimises uniqueList()
 2015-05-10 18:13:17 +03:00
Chinsky
6b57189076 Merge pull request #9171 from PsiOmegaDelta/DroneSplosion 
Fixes #9169.
 2015-05-10 18:06:22 +03:00
StarSmasher
09b92c347f Optimises uniqueList() 
Credits go to /TG/, I just figured I'd do what the other codebases do and take it over for us as well.

Changes:

Optimises uniquelist()
also renames it from uniquelist() to uniqueList()
Test 1:

1,000,000 random numbers between 1 and 7 in a list.
Clean out duplicates with current uniquelist(), once:
self: 0.362
Clean out duplicates with my new uniqueList(), once:
self: 0.184

Test 2:

3,000,000 random numbers between 1 and 7 in a list.
Clean out duplicates with current uniquelist(), once:
self: 1.069
Clean out duplicates with my new uniqueList(), once:
self: 0.496
 2015-05-10 16:59:32 +02:00
Zuhayr
6e003e6d99 Merge pull request #9134 from PsiOmegaDelta/UngrabRuntime 
Grabs no longer endless loop runtime.
 2015-05-10 23:20:56 +09:30
PsiOmega
9d883ea914 Corrects implanter attack log. 
The contents of the implant was reported in the attacker/victim log but not the admin log.
 2015-05-10 15:11:37 +02:00
PsiOmega
fff5ea7840 Grabs no longer endless loop runtime. 2015-05-10 12:11:52 +02:00
Ccomp5950
929e64311e Merge pull request #9133 from PsiOmegaDelta/AntagHUDRestrictions 
Enforces antagHUD restrictions.
 2015-05-10 06:03:36 -04:00
PsiOmega
a1ff266981 Updates the event probability sheet with the new events. 2015-05-10 10:58:46 +02:00
PsiOmegaDelta
6f31e46d26 Merge pull request #9168 from PsiOmegaDelta/dev 
Dev
 2015-05-10 10:53:20 +02:00
PsiOmega
647298e550 Fixes #9169. 
Drones can now survive entering chargers and being picked up.
 2015-05-10 10:52:56 +02:00
PsiOmega
f3e37861cf Updates changelog. 2015-05-10 10:44:16 +02:00
PsiOmega
5de22ace82 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/gloves/miscellaneous.dm
 2015-05-10 10:43:46 +02:00
PsiOmegaDelta
7011adfd63 Merge pull request #9167 from Baystation12/master 
Dev-freeze
 2015-05-10 10:42:52 +02:00
PsiOmegaDelta
928b0a8be5 Merge pull request #9162 from volas/admin_stuff3 
Admin dice
 2015-05-10 10:11:29 +02:00
PsiOmegaDelta
cd264fb558 Merge pull request #9160 from GinjaNinja32/acting_manifest 
Acting jobs now sort with non-acting jobs on the manifest.
 2015-05-10 10:10:13 +02:00
volas
a0f119b9dc Admin dice 2015-05-10 10:11:07 +03:00
Zuhayr
c0bb92bf34 Merge pull request #9146 from PsiOmegaDelta/AlarmConsoles 
Station alarm monitor changes.
 2015-05-10 15:37:50 +09:30
Zuhayr
a64f91994b Merge pull request #9151 from Yoshax/nomorechems 
Removes sleepy chems from cloning
 2015-05-10 15:37:21 +09:30
Zuhayr
90fd4d584e Merge pull request #9164 from comma/sterile 
Made sterile gloves actually start sterile
 2015-05-10 15:11:29 +09:30
Chinsky
6618b225a0 Made sterile gloves actually start sterile 
Fixes #9163
 2015-05-09 22:10:39 +03:00